Check for signalContact vs. AB setup.

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

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 364f416a69
commit a056c1e052

@ -45,6 +45,8 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
// TODO: Remove this method. // TODO: Remove this method.
- (NSArray<Contact *> *)signalContacts; - (NSArray<Contact *> *)signalContacts;
#pragma mark - Util
- (NSString *)displayNameForPhoneIdentifier:(nullable NSString *)identifier; - (NSString *)displayNameForPhoneIdentifier:(nullable NSString *)identifier;
- (NSString *)displayNameForContact:(Contact *)contact; - (NSString *)displayNameForContact:(Contact *)contact;
- (NSString *)displayNameForSignalAccount:(SignalAccount *)signalAccount; - (NSString *)displayNameForSignalAccount:(SignalAccount *)signalAccount;
@ -53,9 +55,6 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
- (NSAttributedString *)formattedFullNameForContact:(Contact *)contact font:(UIFont *)font; - (NSAttributedString *)formattedFullNameForContact:(Contact *)contact font:(UIFont *)font;
- (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font; - (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font;
// TODO migrate to CNContact?
- (BOOL)hasAddressBook;
+ (NSComparator _Nonnull)contactComparator; + (NSComparator _Nonnull)contactComparator;
@end @end

@ -448,11 +448,6 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification =
return contact.image; return contact.image;
} }
- (BOOL)hasAddressBook
{
return (BOOL)self.addressBookReference;
}
#pragma mark - Logging #pragma mark - Logging
+ (NSString *)tag + (NSString *)tag

@ -119,9 +119,9 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
- (void)sendSyncContactsMessageIfPossible - (void)sendSyncContactsMessageIfPossible
{ {
AssertIsOnMainThread(); AssertIsOnMainThread();
if (self.contactsManager.signalContacts.count == 0) {
if (![self.contactsManager hasAddressBook]) { // Don't bother if the contacts manager has no contacts,
// Don't bother until the contacts manager has finished setup. // e.g. if the contacts manager hasn't finished setup.
return; return;
} }

Loading…
Cancel
Save