From 28caf7a5b042ec1c91cd57612fdb3544eae86297 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 20 Nov 2019 17:31:26 +0100
Subject: [PATCH] Fixed group chat room creation issues

---
 .../chat/ChatRoomCreationFragment.java        |  4 ++--
 .../org/linphone/chat/GroupInfoFragment.java  |  4 +++-
 .../contacts/SearchContactViewHolder.java     |  4 +++-
 .../contacts/SearchContactsAdapter.java       | 24 +++++++++++--------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
index 23b6eb2c4..aa4e3eaa9 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
@@ -143,8 +143,8 @@ public class ChatRoomCreationFragment extends Fragment
                         if (mChatRoomAddress == null && mChatRoomSubject == null) {
                             mContactsSelectedLayout.removeAllViews();
                         } else {
-                            // Pop the back stack twice so we don't have in stack Group -> Creation
-                            // -> Group
+                            // Pop the back stack twice so we don't have in stack
+                            // Group -> Creation -> Group
                             getFragmentManager().popBackStack();
                             getFragmentManager().popBackStack();
                         }
diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
index bfb632412..02126b2c9 100644
--- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
+++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
@@ -476,7 +476,9 @@ public class GroupInfoFragment extends Fragment {
             }
             Address[] participantsToAdd = new Address[toAdd.size()];
             toAdd.toArray(participantsToAdd);
-            mChatRoom.addParticipants(participantsToAdd);
+            if (!mChatRoom.addParticipants(participantsToAdd)) {
+                // TODO error
+            }
             // Pop back stack to go back to the Messages fragment
             getFragmentManager().popBackStack();
         }
diff --git a/app/src/main/java/org/linphone/contacts/SearchContactViewHolder.java b/app/src/main/java/org/linphone/contacts/SearchContactViewHolder.java
index 89a47050e..8085860e6 100644
--- a/app/src/main/java/org/linphone/contacts/SearchContactViewHolder.java
+++ b/app/src/main/java/org/linphone/contacts/SearchContactViewHolder.java
@@ -54,7 +54,9 @@ public class SearchContactViewHolder extends RecyclerView.ViewHolder
     @Override
     public void onClick(View view) {
         if (mListener != null) {
-            mListener.onItemClicked(getAdapterPosition());
+            if (disabled.getVisibility() == View.GONE) {
+                mListener.onItemClicked(getAdapterPosition());
+            }
         }
     }
 
diff --git a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
index c41d6022f..c0e67e03e 100644
--- a/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
+++ b/app/src/main/java/org/linphone/contacts/SearchContactsAdapter.java
@@ -32,6 +32,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.contacts.views.ContactAvatar;
 import org.linphone.core.Address;
+import org.linphone.core.Core;
 import org.linphone.core.FriendCapability;
 import org.linphone.core.PresenceBasicStatus;
 import org.linphone.core.PresenceModel;
@@ -118,8 +119,20 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
                 holder.name.setText(searchResult.getAddress().getDisplayName());
             }
         }
-
         holder.disabled.setVisibility(View.GONE);
+
+        if (mSecurityEnabled || !mIsOnlyOnePersonSelection) {
+            Core core = LinphoneManager.getCore();
+            ProxyConfig defaultProxyConfig = core.getDefaultProxyConfig();
+            if (defaultProxyConfig != 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
+                    holder.disabled.setVisibility(View.VISIBLE);
+                }
+            }
+        }
+
         if (contact != null) {
             if (contact.getFullName() == null
                     && contact.getFirstName() == null
@@ -137,15 +150,6 @@ public class SearchContactsAdapter extends RecyclerView.Adapter<SearchContactVie
                             && !searchResult.hasCapability(FriendCapability.LimeX3Dh))) {
                 // Disable row, contact doesn't have the required capabilities
                 holder.disabled.setVisibility(View.VISIBLE);
-            } else if (mSecurityEnabled || !mIsOnlyOnePersonSelection) {
-                ProxyConfig lpc =
-                        Objects.requireNonNull(LinphoneManager.getCore()).getDefaultProxyConfig();
-                if (lpc != null
-                        && searchResult.getAddress() != null
-                        && lpc.getIdentityAddress().weakEqual(searchResult.getAddress())) {
-                    // Disable row, we can't use our own address in a group chat room
-                    holder.disabled.setVisibility(View.VISIBLE);
-                }
             }
         } else {
             ContactAvatar.displayAvatar(holder.name.getText().toString(), holder.avatarLayout);