From a056c1e0522ddb593e2794011c0faf92842bbdaf Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Wed, 3 May 2017 17:48:25 -0400
Subject: [PATCH] Check for signalContact vs. AB setup.

Same intent as previous check but more to the point, and doesn't
require tracking additional state.

// FREEBIE
---
 Signal/src/contact/OWSContactsManager.h | 5 ++---
 Signal/src/contact/OWSContactsManager.m | 5 -----
 Signal/src/util/OWSContactsSyncing.m    | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Signal/src/contact/OWSContactsManager.h b/Signal/src/contact/OWSContactsManager.h
index 574e8bc94..812694946 100644
--- a/Signal/src/contact/OWSContactsManager.h
+++ b/Signal/src/contact/OWSContactsManager.h
@@ -45,6 +45,8 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
 // TODO: Remove this method.
 - (NSArray<Contact *> *)signalContacts;
 
+#pragma mark - Util
+
 - (NSString *)displayNameForPhoneIdentifier:(nullable NSString *)identifier;
 - (NSString *)displayNameForContact:(Contact *)contact;
 - (NSString *)displayNameForSignalAccount:(SignalAccount *)signalAccount;
@@ -53,9 +55,6 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
 - (NSAttributedString *)formattedFullNameForContact:(Contact *)contact font:(UIFont *)font;
 - (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font;
 
-// TODO migrate to CNContact?
-- (BOOL)hasAddressBook;
-
 + (NSComparator _Nonnull)contactComparator;
 
 @end
diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m
index 642e33586..27623728c 100644
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@@ -448,11 +448,6 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification =
     return contact.image;
 }
 
-- (BOOL)hasAddressBook
-{
-    return (BOOL)self.addressBookReference;
-}
-
 #pragma mark - Logging
 
 + (NSString *)tag
diff --git a/Signal/src/util/OWSContactsSyncing.m b/Signal/src/util/OWSContactsSyncing.m
index 49fa6036d..b1f553325 100644
--- a/Signal/src/util/OWSContactsSyncing.m
+++ b/Signal/src/util/OWSContactsSyncing.m
@@ -119,9 +119,9 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
 - (void)sendSyncContactsMessageIfPossible
 {
     AssertIsOnMainThread();
-
-    if (![self.contactsManager hasAddressBook]) {
-        // Don't bother until the contacts manager has finished setup.
+    if (self.contactsManager.signalContacts.count == 0) {
+        // Don't bother if the contacts manager has no contacts,
+        // e.g. if the contacts manager hasn't finished setup.
         return;
     }