Merge branch 'mkirk/codecleanup-contact-sync'

SignalMessaging/contacts/OWSContactsSyncing.m

@@ -167,7 +167,7 @@ NSString *const kOWSPrimaryStorageOWSContactsSyncingLastMessageKey
         return;
     }
 
-    if ([TSAccountManager sharedInstance]) {
+    if ([TSAccountManager sharedInstance].isRegistered) {
         [self sendSyncContactsMessageIfNecessary];
     }
 }

SignalServiceKit/src/Account/TSAccountManager.h

@@ -34,6 +34,7 @@ extern NSString *const kNSNotificationName_LocalNumberDidChange;
  *  @return registered or not
  */
 + (BOOL)isRegistered;
+- (BOOL)isRegistered;
 
 /**
  *  Returns current phone number for this device, which may not yet have been registered.