Clean up Overflow menu for GV2 groups.

signalapp · May 29, 2020 · 41ebaf3 · 41ebaf3
1 parent 090c400
commit 41ebaf3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -157,7 +157,6 @@
 import org.thoughtcrime.securesms.groups.ui.GroupErrors;
 import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog;
 import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
-import org.thoughtcrime.securesms.groups.ui.pendingmemberinvites.PendingMemberInvitesActivity;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.invites.InviteReminderModel;
 import org.thoughtcrime.securesms.invites.InviteReminderRepository;
@@ -784,6 +783,11 @@ public boolean onPrepareOptionsMenu(Menu menu) {
       hideMenuItem(menu, R.id.menu_mute_notifications);
     }
 
+    if (isActiveV2Group()) {
+      hideMenuItem(menu, R.id.menu_mute_notifications);
+      hideMenuItem(menu, R.id.menu_conversation_settings);
+    }
+
     searchViewItem = menu.findItem(R.id.menu_search);
 
     SearchView                     searchView    = (SearchView) searchViewItem.getActionView();
@@ -855,8 +859,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
     case R.id.menu_edit_group:                handleEditPushGroupV1();                           return true;
-    case R.id.menu_manage_group:              handleManagePushGroup();                           return true;
-    case R.id.menu_pending_members:           handlePendingMembers();                            return true;
+    case R.id.menu_group_settings:            handleManagePushGroup();                           return true;
     case R.id.menu_leave:                     handleLeavePushGroup();                            return true;
     case R.id.menu_invite:                    handleInviteLink();                                return true;
     case R.id.menu_mute_notifications:        handleMuteNotifications();                         return true;
@@ -1158,10 +1161,6 @@ private void handleManagePushGroup() {
     startActivityForResult(ManageGroupActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId()), GROUP_EDIT);
   }
 
-  private void handlePendingMembers() {
-    startActivity(PendingMemberInvitesActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId().requireV2()));
-  }
-
   private void handleDistributionBroadcastEnabled(MenuItem item) {
     distributionType = ThreadDatabase.DistributionTypes.BROADCAST;
     item.setChecked(true);

diff --git a/app/src/main/res/menu/conversation_push_group_v2_options.xml b/app/src/main/res/menu/conversation_push_group_v2_options.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/menu_manage_group"
-          android:title="@string/conversation__menu_manage_group"
+    <item android:id="@+id/menu_group_settings"
+          android:title="@string/conversation__menu_group_settings"
           app:showAsAction="collapseActionView" />
 
-    <item android:id="@+id/menu_leave"
-          android:title="@string/conversation__menu_leave_group"
-          app:showAsAction="collapseActionView"/>
-
-    <item android:id="@+id/menu_pending_members"
-          android:title="@string/conversation__menu_pending_members"
-          app:showAsAction="collapseActionView"/>
-
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1921,7 +1921,7 @@
     <!-- conversation -->
     <string name="conversation__menu_add_attachment">Add attachment</string>
     <string name="conversation__menu_edit_group">Edit group</string>
-    <string name="conversation__menu_manage_group">Manage group</string>
+    <string name="conversation__menu_group_settings">Group settings</string>
     <string name="conversation__menu_leave_group">Leave group</string>
     <string name="conversation__menu_view_all_media">All media</string>
     <string name="conversation__menu_conversation_settings">Conversation settings</string>