From ad7a9e351ee0babd66e9170c2a32511b781f5583 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 2 Jan 2019 11:21:37 +0100
Subject: [PATCH] Fixed crash if search result doesn't have an address

---
 .../linphone/chat/ChatRoomCreationFragment.java  | 16 +++++++++++++---
 .../linphone/contacts/SearchContactsAdapter.java |  5 -----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
index 7a65e535d..46b3b4ecb 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
@@ -598,9 +598,19 @@ public class ChatRoomCreationFragment extends Fragment
                                         mChatRoom.getPeerAddress().asStringUriOnly(), mShareInfos);
                     }
                 } else {
-                    ChatRoom chatRoom = lc.getChatRoom(searchResult.getAddress());
-                    LinphoneActivity.instance()
-                            .goToChat(chatRoom.getPeerAddress().asStringUriOnly(), mShareInfos);
+                    Address address = searchResult.getAddress();
+                    if (address == null) {
+                        Log.w("[Chat Room Creation] Using search result without an address...");
+                        address = lc.interpretUrl(searchResult.getPhoneNumber());
+                    }
+                    if (address != null) {
+                        ChatRoom chatRoom = lc.getChatRoom(address);
+                        LinphoneActivity.instance()
+                                .goToChat(chatRoom.getPeerAddress().asStringUriOnly(), mShareInfos);
+                    } else {
+                        Log.e(
+                                "[Chat Room Creation] Can't create a chat room without a valid address !");
+                    }
                 }
             }
         } else {
diff --git a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
index 5bb02a18e..1f3fa9a5e 100644
--- a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
+++ b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
@@ -228,11 +228,6 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
                         .getContactListFromFilter(search, mOnlySipContact ? domain : "");
 
         for (SearchResult sr : searchResults) {
-            if (sr.getAddress() != null) {
-                Log.e("### " + sr.getPhoneNumber() + " / " + sr.getAddress().asString());
-            } else {
-                Log.e("### " + sr.getPhoneNumber());
-            }
             if (LinphoneActivity.instance()
                     .getResources()
                     .getBoolean(R.bool.hide_sip_contacts_without_presence)) {