From a375e855c764408d0c7944ccfc1a426c07bdac7a Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Thu, 16 Feb 2017 17:14:07 +0100 Subject: [PATCH] Better management of search for display name --- Classes/Utils/FastAddressBook.m | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index fb61cda7a..7b7abcc70 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -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; }