diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
commit | 05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch) | |
tree | f702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/java/eu/siacs/conversations/ui | |
parent | c41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff) | |
parent | 20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 8654e1d62..9f3602ffb 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -379,10 +379,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers MenuItem removeAdminPrivileges = menu.findItem(R.id.remove_admin_privileges); MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room); MenuItem banFromConference = menu.findItem(R.id.ban_from_conference); + MenuItem invite = menu.findItem(R.id.invite); startConversation.setVisible(true); if (contact != null) { showContactDetails.setVisible(true); } + if (user.getRole() == MucOptions.Role.NONE) { + invite.setVisible(true); + } if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) && self.getAffiliation().outranks(user.getAffiliation())) { if (mAdvancedMode) { @@ -403,7 +407,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers } } else { MenuItem sendPrivateMessage = menu.findItem(R.id.send_private_message); - sendPrivateMessage.setVisible(true); + sendPrivateMessage.setVisible(user.getRole().ranks(MucOptions.Role.PARTICIPANT)); } } |