Merge branch 'mkirk/no-sync-profile'

Signal/src/Profiles/OWSProfileManager.m

@@ -252,10 +252,15 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
 
     dispatch_async(dispatch_get_main_queue(), ^{
         if (isLocalUserProfile) {
-            [MultiDeviceProfileKeyUpdateJob runWithProfileKey:userProfile.profileKey
+            // We populate an initial (empty) profile on launch of a new install, but until
-                                              identityManager:self.identityManager
+            // we have a registered account, syncing will fail (and there could not be any
-                                                messageSender:self.messageSender
+            // linked device to sync to at this point anyway).
-                                               profileManager:self];
+            if ([TSAccountManager isRegistered]) {
+                [MultiDeviceProfileKeyUpdateJob runWithProfileKey:userProfile.profileKey
+                                                  identityManager:self.identityManager
+                                                    messageSender:self.messageSender
+                                                   profileManager:self];
+            }
 
             [[NSNotificationCenter defaultCenter] postNotificationNameAsync:kNSNotificationName_LocalProfileDidChange
                                                                      object:nil