From 24ea66c9fcc374ea9b5f0b0057f244b21f6fef99 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 1 Jun 2016 00:12:14 +0200 Subject: [PATCH] display invite again menu item for offline members --- .../siacs/conversations/ui/ConferenceDetailsActivity.java | 6 +++++- src/main/res/menu/muc_details_context.xml | 4 ++++ src/main/res/values/strings.xml | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 80ebb28b4..a82f82458 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -380,10 +380,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) { @@ -404,7 +408,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)); } } diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index af5e691b7..9e9eb8a16 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -8,6 +8,10 @@ android:id="@+id/action_contact_details" android:title="@string/action_contact_details" android:visible="false"/> + Subject Choose participants Creating conferenceā€¦ + Invite again