From a12f791761c70a4464d8d9009397f38f260cae25 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 2 Feb 2018 22:08:42 +0100 Subject: reorder context menu entries for ConferenceDetailsActivity and make membership and ban options visible in standardmode and make adminprevileges visible in advanced mode --- .../de/pixart/messenger/ui/ConferenceDetailsActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 116f174db..6c41187e0 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -459,20 +459,20 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) && self.getAffiliation().outranks(user.getAffiliation())) { if (mAdvancedMode) { - if (user.getAffiliation() == MucOptions.Affiliation.NONE) { - giveMembership.setVisible(true); + if (user.getAffiliation() != MucOptions.Affiliation.ADMIN) { + giveAdminPrivileges.setVisible(true); } else { - removeMembership.setVisible(true); + removeAdminPrivileges.setVisible(true); } - banFromConference.setVisible(true); } else { removeFromRoom.setVisible(true); } - if (user.getAffiliation() != MucOptions.Affiliation.ADMIN) { - giveAdminPrivileges.setVisible(true); + if (user.getAffiliation() == MucOptions.Affiliation.NONE) { + giveMembership.setVisible(true); } else { - removeAdminPrivileges.setVisible(true); + removeMembership.setVisible(true); } + banFromConference.setVisible(true); } } else { MenuItem sendPrivateMessage = menu.findItem(R.id.send_private_message); -- cgit v1.2.3