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

Optimize: don't search in friends if a Contact is found

Browse source
This commit is contained in:
Simon Morlat 2018-03-03 16:49:31 +01:00
parent f3c381b56b
commit 2fecb07356
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Classes/Utils/FastAddressBook.m
View file

@ -291,18 +291,20 @@
+ (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);
if (lDisplayName) {
ret = [NSString stringWithUTF8String:lDisplayName];
} else if (lUserName) {
ret = [NSString stringWithUTF8String:lUserName];
LinphoneFriend *friend = linphone_core_find_friend(LC, addr);
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);
if (lDisplayName) {
ret = [NSString stringWithUTF8String:lDisplayName];
} else if (lUserName) {
ret = [NSString stringWithUTF8String:lUserName];
}
}
}
return ret;