Merge branch 'mkirk/codecleanup-contact-sync'

7 years ago · 69aeb041ba
parent d0d9d5456c b1f3324514
commit 69aeb041ba
2 changed files with 2 additions and 1 deletions
--- a/SignalMessaging/contacts/OWSContactsSyncing.m
+++ b/SignalMessaging/contacts/OWSContactsSyncing.m
@ -167,7 +167,7 @@ NSString *const kOWSPrimaryStorageOWSContactsSyncingLastMessageKey
        return;
    }

-    if ([TSAccountManager sharedInstance]) {
+    if ([TSAccountManager sharedInstance].isRegistered) {
        [self sendSyncContactsMessageIfNecessary];
    }
 }
--- a/SignalServiceKit/src/Account/TSAccountManager.h
+++ b/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.