From 2fecb073566442d0ad1894779fb22e19668a050d Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sat, 3 Mar 2018 16:49:31 +0100
Subject: [PATCH] Optimize: don't search in friends if a Contact is found

---
 Classes/Utils/FastAddressBook.m | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index aff2f9ce0..d44494379 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -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;