From d9a728922f5622fe3d7a536829206d48bd4d01a8 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 28 May 2019 13:10:11 +1000 Subject: [PATCH] Ditch public key part of display name --- SignalMessaging/contacts/OWSContactsManager.m | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m index 5fff6b8a0..6e7816693 100644 --- a/SignalMessaging/contacts/OWSContactsManager.m +++ b/SignalMessaging/contacts/OWSContactsManager.m @@ -952,13 +952,17 @@ NSString *const OWSContactsManagerKeyNextFullIntersectionDate = @"OWSContactsMan NSString *_Nullable profileName = [self.profileManager profileNameForRecipientId:recipientId]; if (profileName.length > 0) { - NSAttributedString *result = - [[NSAttributedString alloc] initWithString:recipientId attributes:primaryAttributes]; - result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@" "]]; - result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@"~" attributes:secondaryAttributes]]; - result = [result - rtlSafeAppend:[[NSAttributedString alloc] initWithString:profileName attributes:secondaryAttributes]]; - return [result copy]; + return [[NSAttributedString alloc] initWithString:profileName]; + // Loki: Original code + // ======== +// NSAttributedString *result = +// [[NSAttributedString alloc] initWithString:recipientId attributes:primaryAttributes]; +// result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@" "]]; +// result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@"~" attributes:secondaryAttributes]]; +// result = [result +// rtlSafeAppend:[[NSAttributedString alloc] initWithString:profileName attributes:secondaryAttributes]]; +// return [result copy]; + // ======== } // else fall back to recipient id