From a9aa99e5b849ff854673d7b546adc610228c7a5a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 13 Nov 2017 11:13:54 +0100
Subject: [PATCH] Always display which participant is admin in group chat info

---
 .../org/linphone/chat/GroupInfoAdapter.java   | 26 +++++++++----------
 .../org/linphone/chat/GroupInfoFragment.java  |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/android/org/linphone/chat/GroupInfoAdapter.java b/src/android/org/linphone/chat/GroupInfoAdapter.java
index c6fe1c129..1532399d6 100644
--- a/src/android/org/linphone/chat/GroupInfoAdapter.java
+++ b/src/android/org/linphone/chat/GroupInfoAdapter.java
@@ -88,9 +88,9 @@ public class GroupInfoAdapter extends BaseAdapter {
         delete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (mDeleteListener != null) {
-                    mDeleteListener.onClick(view);
-                }
+            if (mDeleteListener != null) {
+                mDeleteListener.onClick(view);
+            }
             }
         });
         delete.setTag(ca);
@@ -101,28 +101,26 @@ public class GroupInfoAdapter extends BaseAdapter {
         isAdmin.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                isNotAdmin.setVisibility(View.VISIBLE);
-                isAdmin.setVisibility(View.GONE);
-                ca.setAdmin(false);
+            isNotAdmin.setVisibility(View.VISIBLE);
+            isAdmin.setVisibility(View.GONE);
+            ca.setAdmin(false);
             }
         });
 
         isNotAdmin.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                isNotAdmin.setVisibility(View.GONE);
-                isAdmin.setVisibility(View.VISIBLE);
-                ca.setAdmin(true);
+            isNotAdmin.setVisibility(View.GONE);
+            isAdmin.setVisibility(View.VISIBLE);
+            ca.setAdmin(true);
             }
         });
 
 	    delete.setVisibility(View.VISIBLE);
-	    adminLayout.setVisibility(View.VISIBLE);
         if (mHideAdminFeatures) {
-            delete.setVisibility(View.GONE);
-            adminLayout.setVisibility(View.GONE);
-        } else if (mIsCreation) {
-	        adminLayout.setVisibility(View.GONE);
+            delete.setVisibility(View.INVISIBLE);
+            isAdmin.setOnClickListener(null); // Do not allow not admin to remove it's rights but display admins
+            isNotAdmin.setVisibility(View.GONE); // Hide not admin button for not admin participants
         }
 
         return view;
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index eebfbfbe6..2c894ff17 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -331,8 +331,8 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 		if (mChatRoom.getMe().isAdmin() != mIsEditionEnabled) {
 			// Either we weren't admin and we are now or the other way around
 			mIsEditionEnabled = mChatRoom.getMe().isAdmin();
-			refreshAdminRights();
 			displayMeAdminStatusUpdated();
+			refreshAdminRights();
 		}
 		refreshParticipantsList();
 	}