Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always display which participant is admin in group chat info

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-13 11:13:54 +01:00
parent 66ad2a6b05
commit f1abb0f786
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/android/org/linphone/chat/GroupInfoAdapter.java
View file

@ -76,7 +76,6 @@ public class GroupInfoAdapter extends BaseAdapter {
TextView name = view.findViewById(R.id.name); TextView name = view.findViewById(R.id.name);
ImageView avatar = view.findViewById(R.id.contact_picture); ImageView avatar = view.findViewById(R.id.contact_picture);
ImageView delete = view.findViewById(R.id.delete); ImageView delete = view.findViewById(R.id.delete);
LinearLayout adminLayout = view.findViewById(R.id.adminLayout);
final LinearLayout isAdmin = view.findViewById(R.id.isAdminLayout); final LinearLayout isAdmin = view.findViewById(R.id.isAdminLayout);
final LinearLayout isNotAdmin = view.findViewById(R.id.isNotAdminLayout); final LinearLayout isNotAdmin = view.findViewById(R.id.isNotAdminLayout);
@ -117,12 +116,10 @@ public class GroupInfoAdapter extends BaseAdapter {
}); });
delete.setVisibility(View.VISIBLE); delete.setVisibility(View.VISIBLE);
adminLayout.setVisibility(View.VISIBLE);
if (mHideAdminFeatures) { if (mHideAdminFeatures) {
delete.setVisibility(View.GONE); delete.setVisibility(View.INVISIBLE);
adminLayout.setVisibility(View.GONE); isAdmin.setOnClickListener(null); // Do not allow not admin to remove it's rights but display admins
} else if (mIsCreation) { isNotAdmin.setVisibility(View.GONE); // Hide not admin button for not admin participants
adminLayout.setVisibility(View.GONE);
} }
return view; return view;

2
src/android/org/linphone/chat/GroupInfoFragment.java
View file

@ -331,8 +331,8 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
if (mChatRoom.getMe().isAdmin() != mIsEditionEnabled) { if (mChatRoom.getMe().isAdmin() != mIsEditionEnabled) {
// Either we weren't admin and we are now or the other way around // Either we weren't admin and we are now or the other way around
mIsEditionEnabled = mChatRoom.getMe().isAdmin(); mIsEditionEnabled = mChatRoom.getMe().isAdmin();
refreshAdminRights();
displayMeAdminStatusUpdated(); displayMeAdminStatusUpdated();
refreshAdminRights();
} }
refreshParticipantsList(); refreshParticipantsList();
} }