From 059ad220445e4c1d1155f514e9533aee6e003d81 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 24 Oct 2017 13:53:28 +0200 Subject: [PATCH] Do not show admin buttons when creating a group chat room --- src/android/org/linphone/chat/GroupInfoAdapter.java | 7 +++++-- src/android/org/linphone/chat/GroupInfoFragment.java | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/android/org/linphone/chat/GroupInfoAdapter.java b/src/android/org/linphone/chat/GroupInfoAdapter.java index 1af9120d5..f2ab441c0 100644 --- a/src/android/org/linphone/chat/GroupInfoAdapter.java +++ b/src/android/org/linphone/chat/GroupInfoAdapter.java @@ -40,12 +40,13 @@ public class GroupInfoAdapter extends BaseAdapter { private LayoutInflater mInflater; private List mItems; private View.OnClickListener mDeleteListener; - private boolean mHideAdminFeatures; + private boolean mHideAdminFeatures, mIsCreation; - public GroupInfoAdapter(LayoutInflater inflater, List items, boolean hideAdminFeatures) { + public GroupInfoAdapter(LayoutInflater inflater, List items, boolean hideAdminFeatures, boolean isCreation) { mInflater = inflater; mItems = items; mHideAdminFeatures = hideAdminFeatures; + mIsCreation = isCreation; } @Override @@ -118,6 +119,8 @@ public class GroupInfoAdapter extends BaseAdapter { if (mHideAdminFeatures) { delete.setVisibility(View.GONE); adminLayout.setVisibility(View.GONE); + } else if (mIsCreation) { + adminLayout.setVisibility(View.GONE); } return view; diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java index 6345aa293..a88efe584 100644 --- a/src/android/org/linphone/chat/GroupInfoFragment.java +++ b/src/android/org/linphone/chat/GroupInfoFragment.java @@ -62,7 +62,7 @@ public class GroupInfoFragment extends Fragment { String subject = getArguments().getString("subject"); mParticipantsList = view.findViewById(R.id.chat_room_participants); - mAdapter = new GroupInfoAdapter(mInflater, mParticipants, !mIsEditionEnabled); + mAdapter = new GroupInfoAdapter(mInflater, mParticipants, !mIsEditionEnabled, !mIsAlreadyCreatedGroup); mAdapter.setOnDeleteClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -139,8 +139,6 @@ public class GroupInfoFragment extends Fragment { mAddParticipantsButton.setVisibility(View.GONE); } - //TODO Handle back button issue - return view; } }