From 14a75365dff473bba49ee3af34e2c7d7529a84c9 Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Thu, 11 Apr 2019 15:15:49 +0200
Subject: [PATCH] fix ChatConversationCreateView

---
 Classes/ChatConversationCreateTableView.m | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Classes/ChatConversationCreateTableView.m b/Classes/ChatConversationCreateTableView.m
index fd9ff470c..d745f0637 100644
--- a/Classes/ChatConversationCreateTableView.m
+++ b/Classes/ChatConversationCreateTableView.m
@@ -78,7 +78,17 @@
 		LinphoneSearchResult *result = results->data;
 		const LinphoneAddress *addr = linphone_search_result_get_address(result);
 		const char *phoneNumber = NULL;
-		if (!addr) {
+		
+		Contact *contact = nil;
+		char *uri = nil;
+		NSString *address = nil;
+		if (addr) {
+			uri = linphone_address_as_string_uri_only(addr);
+			address = [NSString stringWithUTF8String:uri];
+			contact = [LinphoneManager.instance.fastAddressBook.addressBookMap objectForKey:[FastAddressBook normalizeSipURI:address]];
+		}
+		
+		if (!addr || !contact) {
 			phoneNumber = linphone_search_result_get_phone_number(result);
 			if (!phoneNumber) {
 				results = results->next;
@@ -88,6 +98,8 @@
 			LinphoneProxyConfig *cfg = linphone_core_get_default_proxy_config(LC);
 			const char *normalizedPhoneNumber = linphone_proxy_config_normalize_phone_number(cfg, phoneNumber);
 			addr = linphone_proxy_config_normalize_sip_uri(cfg, normalizedPhoneNumber);
+			uri = linphone_address_as_string_uri_only(addr);
+			address = [NSString stringWithUTF8String:uri];
 		}
 
 		if (!addr) {
@@ -95,8 +107,6 @@
 			continue;
 		}
 
-		char *uri = linphone_address_as_string_uri_only(addr);
-		NSString *address = [NSString stringWithUTF8String:uri];
         ms_free(uri);
         
 		[_addresses addObject:address];