diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-01 00:12:14 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-06-01 00:12:14 +0200 |
| commit | 24ea66c9fcc374ea9b5f0b0057f244b21f6fef99 (patch) | |
| tree | b338d59bdeb60e792e5ed1223b193fcc0bccddff /src | |
| parent | ffba53777cac07e8a3f16fb9dbbdaa61d87a09bd (diff) | |
display invite again menu item for offline members
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 6 | ||||
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
3 files changed, 10 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 80ebb28b..a82f8245 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 af5e691b..9e9eb8a1 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -9,6 +9,10 @@ android:title="@string/action_contact_details" android:visible="false"/> <item + android:id="@+id/invite" + android:title="@string/invite_again" + android:visible="false"/> + <item android:id="@+id/send_private_message" android:title="@string/send_private_message" android:visible="false"/> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0739d0eb..2decae45 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -648,4 +648,5 @@ <string name="conference_subject">Subject</string> <string name="choose_participants">Choose participants</string> <string name="creating_conference">Creating conference…</string> + <string name="invite_again">Invite again</string> </resources> |