From 35a6dc763623a8868382b528c1be01a3d0a19306 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 18 May 2017 10:52:55 -0400 Subject: [PATCH] Show Contact name, not number, of unregistered user // FREEBIE --- Signal/src/contact/OWSContactsManager.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Signal/src/contact/OWSContactsManager.m b/Signal/src/contact/OWSContactsManager.m index fc1edf8c0..7636db0c3 100644 --- a/Signal/src/contact/OWSContactsManager.m +++ b/Signal/src/contact/OWSContactsManager.m @@ -250,10 +250,11 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification = return self.unknownContactName; } - // TODO: There's some overlap here with displayNameForSignalAccount. - SignalAccount *signalAccount = [self signalAccountForRecipientId:identifier]; + // When viewing an old thread with someone who is no longer a Signal user, they won't have a SignalAccount + // so we get the name from `allContactsMap` as opposed to `signalAccountForRecipientId`. + Contact *contact = self.allContactsMap[identifier]; - NSString *displayName = (signalAccount.contact.fullName.length > 0) ? signalAccount.contact.fullName : identifier; + NSString *displayName = (contact.fullName.length > 0) ? contact.fullName : identifier; return displayName; }