oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2089 from WhisperSystems/mkirk/no-name-contacts

Browse source 
show number for no-name contacts
This commit is contained in:
Michael Kirk 2017-05-09 16:57:52 -04:00 committed by GitHub
parent bfc4ff6f05 8411d13ef6
commit 279439843e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Signal/src/contact/OWSContactsManager.m
View file

@ -285,6 +285,11 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification =
OWSAssert(font);
NSAttributedString *baseName = [self formattedFullNameForContact:signalAccount.contact font:font];
if (baseName.length == 0) {
baseName = [self formattedFullNameForRecipientId:signalAccount.recipientId font:font];
}
OWSAssert(signalAccount.hasMultipleAccountContact == (signalAccount.multipleAccountLabelText != nil));
if (signalAccount.multipleAccountLabelText) {
NSMutableAttributedString *result = [NSMutableAttributedString new];
@ -343,13 +348,13 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification =
}
NSMutableAttributedString *fullNameString = [NSMutableAttributedString new];
if (leftName) {
if (leftName.length > 0) {
[fullNameString appendAttributedString:leftName];
}
if (leftName && rightName) {
if (leftName.length > 0 && rightName.length > 0) {
[fullNameString appendAttributedString:[[NSAttributedString alloc] initWithString:@" "]];
}
if (rightName) {
if (rightName.length > 0) {
[fullNameString appendAttributedString:rightName];
}