witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

not use nickname as displyname if empty

Browse source
This commit is contained in:
Danmei Chen 2020-07-20 11:17:56 +02:00
parent 91b0c38a2f
commit cced8b3258
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/Contact.m
View file

@ -136,7 +136,7 @@
NSString *lOrganization = _person.organizationName;
NSString *lLocalizedOrganization = [FastAddressBook localizedLabel:lOrganization];
if (compositeName)
if (compositeName && ![compositeName isEqualToString:@""])
return compositeName;
if (lLocalizedFirstName || lLocalizedLastName)
return [NSString stringWithFormat:@"%@ %@", lLocalizedFirstName, lLocalizedLastName];

2
Classes/Utils/FastAddressBook.m
View file

@ -318,7 +318,7 @@
+ (NSString *)displayNameForAddress:(const LinphoneAddress *)addr {
Contact *contact = [FastAddressBook getContactWithAddress:addr];
if (contact && ![contact.displayName isEqualToString:@""])
if (contact && ![contact.displayName isEqualToString:NSLocalizedString(@"Unknown", nil)])
return [FastAddressBook displayNameForContact:contact];
LinphoneFriend *friend = linphone_core_find_friend(LC, addr);