From b80d12b106f40f25366ff0e631249642f48d5f77 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Nov 2017 11:26:12 +0100 Subject: [PATCH] Fixed stacking dialog for admin state changed --- .../org/linphone/chat/GroupInfoFragment.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java index 2c894ff17..686d5fb41 100644 --- a/src/android/org/linphone/chat/GroupInfoFragment.java +++ b/src/android/org/linphone/chat/GroupInfoFragment.java @@ -66,6 +66,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener { private ArrayList mParticipants; private String mSubject; private ChatRoom mChatRoom; + private Dialog mAdminStateChangedDialog; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -302,18 +303,21 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener { } private void displayMeAdminStatusUpdated() { - final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(mIsEditionEnabled ? R.string.chat_room_you_are_now_admin : R.string.chat_room_you_are_no_longer_admin)); - Button delete = dialog.findViewById(R.id.delete_button); - Button cancel = dialog.findViewById(R.id.cancel); + if (mAdminStateChangedDialog != null) mAdminStateChangedDialog.dismiss(); + + mAdminStateChangedDialog = LinphoneActivity.instance().displayDialog(getString(mIsEditionEnabled ? R.string.chat_room_you_are_now_admin : R.string.chat_room_you_are_no_longer_admin)); + Button delete = mAdminStateChangedDialog.findViewById(R.id.delete_button); + Button cancel = mAdminStateChangedDialog.findViewById(R.id.cancel); delete.setVisibility(View.GONE); cancel.setText(getString(R.string.ok)); cancel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - dialog.dismiss(); + mAdminStateChangedDialog.dismiss(); } }); - dialog.show(); + + mAdminStateChangedDialog.show(); } @Override