From 295bc57a990431a7912967570f486081dff498fb Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 12 Sep 2019 11:22:42 +1000 Subject: [PATCH] Include public key with display names --- SignalServiceKit/src/Messages/OWSMessageManager.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index e7f5a667d..5d5bad36a 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1468,8 +1468,13 @@ NS_ASSUME_NONNULL_BEGIN serverTimestamp:serverTimestamp wasReceivedByUD:wasReceivedByUD]; - NSString *displayName = dataMessage.profile.displayName; - [self.profileManager setDisplayNameForContactWithID:thread.contactIdentifier to:displayName with:transaction]; + NSString *rawDisplayName = dataMessage.profile.displayName; + if (rawDisplayName != nil && rawDisplayName.length > 0) { + NSString *displayName = [NSString stringWithFormat:@"%@ (...%@)", rawDisplayName, [incomingMessage.authorId substringFromIndex:incomingMessage.authorId.length - 8]]; + [self.profileManager setDisplayNameForContactWithID:thread.contactIdentifier to:displayName with:transaction]; + } else { + [self.profileManager setDisplayNameForContactWithID:thread.contactIdentifier to:nil with:transaction]; + } if (envelope.isPtpMessage) { incomingMessage.isP2P = YES; }