From 7c288054420586233e43e06040caa0a6a16d3f57 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Fri, 21 Jul 2017 17:34:08 -0400
Subject: [PATCH] Don't consider yourself registered until you've uploaded your
 prekeys

// FREEBIE
---
 SignalServiceKit/src/Account/TSAccountManager.m | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index 8ffafec7e..284a615eb 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -234,6 +234,11 @@ NSString *const kNSNotificationName_LocalNumberDidChange = @"kNSNotificationName
                                                                                forNumber:phoneNumber
                                                                             signalingKey:signalingKey
                                                                                  authKey:authToken];
+    void (^completedRegistrationBlock)() = ^{
+        [self didRegister];
+        [TSSocketManager requestSocketOpen];
+        successBlock();
+    };
 
     [self.networkManager makeRequest:request
         success:^(NSURLSessionDataTask *task, id responseObject) {
@@ -244,10 +249,8 @@ NSString *const kNSNotificationName_LocalNumberDidChange = @"kNSNotificationName
                 case 200:
                 case 204: {
                     [TSStorageManager storeServerToken:authToken signalingKey:signalingKey];
-                    [self didRegister];
-                    [TSSocketManager requestSocketOpen];
                     [TSPreKeyManager registerPreKeysWithMode:RefreshPreKeysMode_SignedAndOneTime
-                                                     success:successBlock
+                                                     success:completedRegistrationBlock
                                                      failure:failureBlock];
                     break;
                 }