From 7dab94fe2cf7ea4b72bce0711b6a7e29ae030246 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 16 Jan 2020 17:09:18 +0100
Subject: [PATCH] Fixed crashes

---
 .../java/org/linphone/compatibility/ApiTwentyFivePlus.java | 7 +++++--
 .../java/org/linphone/contacts/SearchContactsAdapter.java  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/compatibility/ApiTwentyFivePlus.java b/app/src/main/java/org/linphone/compatibility/ApiTwentyFivePlus.java
index 53a415164..7d0729245 100644
--- a/app/src/main/java/org/linphone/compatibility/ApiTwentyFivePlus.java
+++ b/app/src/main/java/org/linphone/compatibility/ApiTwentyFivePlus.java
@@ -66,10 +66,13 @@ class ApiTwentyFivePlus {
             Address participantAddress =
                     room.hasCapability(ChatRoomCapabilities.Basic.toInt())
                             ? room.getPeerAddress()
-                            : room.getParticipants()[0].getAddress();
+                            : room.getParticipants().length == 0
+                                    ? null
+                                    : room.getParticipants()[0].getAddress();
+            if (participantAddress == null) continue;
+
             LinphoneContact contact =
                     ContactsManager.getInstance().findContactFromAddress(participantAddress);
-
             if (contact != null && !contacts.contains(contact)) {
                 if (context.getResources().getBoolean(R.bool.shortcut_to_contact)) {
                     ShortcutInfo shortcut = manager.createContactShortcutInfo(contact);
diff --git a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
index c0e67e03e..c3537b855 100644
--- a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
+++ b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
@@ -124,7 +124,7 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
         if (mSecurityEnabled || !mIsOnlyOnePersonSelection) {
             Core core = LinphoneManager.getCore();
             ProxyConfig defaultProxyConfig = core.getDefaultProxyConfig();
-            if (defaultProxyConfig != null) {
+            if (defaultProxyConfig != null && searchResult.getAddress() != null) {
                 // SDK won't accept ourselves in the list of participants
                 if (defaultProxyConfig.getIdentityAddress().weakEqual(searchResult.getAddress())) {
                     // Disable row, we can't use our own address in a group chat room