SEPARATE: Use non-signal contact's full name

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 113cb254d9
commit 90dda0bf9c

@ -371,10 +371,16 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
{ {
OWSAssert(recipientId.length > 0); OWSAssert(recipientId.length > 0);
SignalAccount *signalAccount = [self signalAccountForRecipientId:recipientId]; SignalAccount *_Nullable signalAccount = [self signalAccountForRecipientId:recipientId];
if (!signalAccount) { if (!signalAccount) {
// 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 nil;
} }
return nonSignalContact.fullName;
}
NSString *fullName = signalAccount.contactFullName; NSString *fullName = signalAccount.contactFullName;
if (fullName.length == 0) { if (fullName.length == 0) {

Loading…
Cancel
Save