From 90dda0bf9c42919bf5775ec90316f04ce541a382 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Sat, 21 Apr 2018 15:22:49 -0400
Subject: [PATCH] SEPARATE: Use non-signal contact's full name

// FREEBIE
---
 SignalMessaging/contacts/OWSContactsManager.m | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
index 5d6ef6deb..96a3dc6b2 100644
--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@@ -371,9 +371,15 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
 {
     OWSAssert(recipientId.length > 0);
 
-    SignalAccount *signalAccount = [self signalAccountForRecipientId:recipientId];
+    SignalAccount *_Nullable signalAccount = [self signalAccountForRecipientId:recipientId];
     if (!signalAccount) {
-        return nil;
+        // search system contacts for no-longer-registered signal users, for which there will be no SignalAccount
+        DDLogDebug(@"%@ no signal account", self.logTag);
+        Contact *_Nullable nonSignalContact = self.allContactsMap[recipientId];
+        if (!nonSignalContact) {
+            return nil;
+        }
+        return nonSignalContact.fullName;
     }
 
     NSString *fullName = signalAccount.contactFullName;