From eb190ae52545993954a2524459608c609446291c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 1 Apr 2019 14:14:19 +0200
Subject: [PATCH] Fixed multiple contacts using same address or phone number in
 magic search results

---
 .../contacts/SearchContactsAdapter.java         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
index 499e42147..72f6e4719 100644
--- a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
+++ b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
@@ -85,13 +85,18 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
         SearchResult searchResult = getItem(position);
 
         LinphoneContact contact;
-        if (searchResult.getAddress() == null) {
-            contact =
-                    ContactsManager.getInstance()
-                            .findContactFromPhoneNumber(searchResult.getPhoneNumber());
+        if (searchResult.getFriend() != null && searchResult.getFriend().getUserData() != null) {
+            contact = (LinphoneContact) searchResult.getFriend().getUserData();
         } else {
-            contact =
-                    ContactsManager.getInstance().findContactFromAddress(searchResult.getAddress());
+            if (searchResult.getAddress() == null) {
+                contact =
+                        ContactsManager.getInstance()
+                                .findContactFromPhoneNumber(searchResult.getPhoneNumber());
+            } else {
+                contact =
+                        ContactsManager.getInstance()
+                                .findContactFromAddress(searchResult.getAddress());
+            }
         }
 
         final String numberOrAddress =