From 50ec55c313f592c5dae8b9c76318f0eaadae8997 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 2 Oct 2017 11:31:59 -0400
Subject: [PATCH] Fix the "is contact" test.

// FREEBIE
---
 .../ConversationView/ConversationViewController.m   |  6 +++---
 Signal/src/contact/OWSContactsManager.h             |  3 +++
 Signal/src/contact/OWSContactsManager.m             | 13 ++++++++++++-
 Signal/src/util/ThreadUtil.m                        |  4 ++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 0c632ead9..ffe61c717 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -423,8 +423,8 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
                                                  name:kNSNotificationName_ProfileWhitelistDidChange
                                                object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(signalAccountsDidChange:)
-                                                 name:OWSContactsManagerSignalAccountsDidChangeNotification
+                                             selector:@selector(contactsDidChange:)
+                                                 name:OWSContactsManagerContactListDidChangeNotification
                                                object:nil];
 }
 
@@ -446,7 +446,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardDidShowNotification object:nil];
 }
 
-- (void)signalAccountsDidChange:(NSNotification *)notification
+- (void)contactsDidChange:(NSNotification *)notification
 {
     OWSAssert([NSThread isMainThread]);
 
diff --git a/Signal/src/contact/OWSContactsManager.h b/Signal/src/contact/OWSContactsManager.h
index 32dbf1a58..4f4f104ca 100644
--- a/Signal/src/contact/OWSContactsManager.h
+++ b/Signal/src/contact/OWSContactsManager.h
@@ -8,6 +8,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
+// Fired when the list of contact phone numbers changes, not when
+// other contact properties change.
+extern NSString *const OWSContactsManagerContactListDidChangeNotification;
 
 @class ImageCache;
 @class SignalAccount;
diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m
index c402bb04b..13952ada9 100644
--- a/Signal/src/contact/OWSContactsManager.m
+++ b/Signal/src/contact/OWSContactsManager.m
@@ -17,7 +17,9 @@
 @import Contacts;
 
 NSString *const OWSContactsManagerSignalAccountsDidChangeNotification =
-    @"OWSContactsManagerSignalAccountsDidChangeNotification";
+@"OWSContactsManagerSignalAccountsDidChangeNotification";
+NSString *const OWSContactsManagerContactListDidChangeNotification =
+@"OWSContactsManagerContactListDidChangeNotification";
 
 NSString *const kTSStorageManager_AccountDisplayNames = @"kTSStorageManager_AccountDisplayNames";
 NSString *const kTSStorageManager_AccountFirstNames = @"kTSStorageManager_AccountFirstNames";
@@ -53,6 +55,7 @@ NSString *const kTSStorageManager_AccountLastNames = @"kTSStorageManager_Account
     // TODO: We need to configure the limits of this cache.
     _avatarCache = [ImageCache new];
     _allContacts = @[];
+    _allContactsMap = @{};
     _signalAccountMap = @{};
     _signalAccounts = @[];
     _systemContactsFetcher = [SystemContactsFetcher new];
@@ -175,6 +178,8 @@ NSString *const kTSStorageManager_AccountLastNames = @"kTSStorageManager_Account
         }
 
         dispatch_async(dispatch_get_main_queue(), ^{
+            BOOL didContactListChange = ![self.allContactsMap isEqual:allContactsMap];
+            
             self.allContacts = contacts;
             self.allContactsMap = [allContactsMap copy];
 
@@ -185,6 +190,12 @@ NSString *const kTSStorageManager_AccountLastNames = @"kTSStorageManager_Account
             [self updateSignalAccounts];
 
             [self updateCachedDisplayNames];
+            
+            if (didContactListChange) {
+                [[NSNotificationCenter defaultCenter]
+                 postNotificationNameAsync:OWSContactsManagerContactListDidChangeNotification
+                 object:nil];
+            }
         });
     });
 }
diff --git a/Signal/src/util/ThreadUtil.m b/Signal/src/util/ThreadUtil.m
index 374c7fec9..9ec55c4c0 100644
--- a/Signal/src/util/ThreadUtil.m
+++ b/Signal/src/util/ThreadUtil.m
@@ -385,8 +385,8 @@ NS_ASSUME_NONNULL_BEGIN
                     shouldHaveAddToProfileWhitelistOffer = NO;
                 }
 
-                SignalAccount *signalAccount = contactsManager.signalAccountMap[recipientId];
-                if (signalAccount) {
+                BOOL isContact = contactsManager.allContactsMap[recipientId] != nil;
+                if (isContact) {
                     // Only create "add to contacts" offers for non-contacts.
                     shouldHaveAddToContactsOffer = NO;
                     // Only create block offers for non-contacts.