Ditch public key part of display name

This commit is contained in:
Niels Andriesse 2019-05-28 13:10:11 +10:00
parent 1462a5cb6b
commit d9a728922f
1 changed files with 11 additions and 7 deletions

View File

@ -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