mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-02 11:19:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better management of search for display name

Browse source
This commit is contained in:
Benjamin Reis 2017-02-16 17:14:07 +01:00
parent 076d0c31ae
commit a375e855c7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Classes/Utils/FastAddressBook.m
View file

@ -300,8 +300,11 @@ void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info, void
+ (NSString *)displayNameForAddress:(const LinphoneAddress *)addr {
NSString *ret = NSLocalizedString(@"Unknown", nil);
Contact *contact = [FastAddressBook getContactWithAddress:addr];
LinphoneFriend *friend = linphone_core_find_friend(LC, addr);
if (contact) {
ret = [FastAddressBook displayNameForContact:contact];
} else if (friend) {
ret = [NSString stringWithUTF8String:linphone_friend_get_name(friend)];
} else {
const char *lDisplayName = linphone_address_get_display_name(addr);
const char *lUserName = linphone_address_get_username(addr);
@ -311,10 +314,6 @@ void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info, void
ret = [NSString stringWithUTF8String:lUserName];
}
}
LinphoneFriend *friend = linphone_core_find_friend(LC, addr);
if (friend) {
ret = [NSString stringWithUTF8String:linphone_friend_get_name(friend)];
}
return ret;
}