TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Overflow menu for GV2 groups.

Browse Source
This commit is contained in:
Alex Hart 2020-05-26 14:19:05 -03:00 committed by Greyson Parrelli
parent 090c400037
commit 41ebaf3938
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -157,7 +157,6 @@ import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
import org.thoughtcrime.securesms.groups.ui.GroupErrors; import org.thoughtcrime.securesms.groups.ui.GroupErrors;
import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog; import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog;
import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity; 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.insights.InsightsLauncher;
import org.thoughtcrime.securesms.invites.InviteReminderModel; import org.thoughtcrime.securesms.invites.InviteReminderModel;
import org.thoughtcrime.securesms.invites.InviteReminderRepository; import org.thoughtcrime.securesms.invites.InviteReminderRepository;
@ -784,6 +783,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
hideMenuItem(menu, R.id.menu_mute_notifications); 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); searchViewItem = menu.findItem(R.id.menu_search);
SearchView searchView = (SearchView) searchViewItem.getActionView(); SearchView searchView = (SearchView) searchViewItem.getActionView();
@ -855,8 +859,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true;
case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(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_edit_group: handleEditPushGroupV1(); return true;
case R.id.menu_manage_group: handleManagePushGroup(); return true; case R.id.menu_group_settings: handleManagePushGroup(); return true;
case R.id.menu_pending_members: handlePendingMembers(); return true;
case R.id.menu_leave: handleLeavePushGroup(); return true; case R.id.menu_leave: handleLeavePushGroup(); return true;
case R.id.menu_invite: handleInviteLink(); return true; case R.id.menu_invite: handleInviteLink(); return true;
case R.id.menu_mute_notifications: handleMuteNotifications(); return true; case R.id.menu_mute_notifications: handleMuteNotifications(); return true;
@ -1158,10 +1161,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
startActivityForResult(ManageGroupActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId()), GROUP_EDIT); 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) { private void handleDistributionBroadcastEnabled(MenuItem item) {
distributionType = ThreadDatabase.DistributionTypes.BROADCAST; distributionType = ThreadDatabase.DistributionTypes.BROADCAST;
item.setChecked(true); item.setChecked(true);

12
app/src/main/res/menu/conversation_push_group_v2_options.xml
View File

@ -1,16 +1,8 @@
<?xml version="1.0" encoding="utf-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"> <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" <item android:id="@+id/menu_group_settings"
android:title="@string/conversation__menu_manage_group" android:title="@string/conversation__menu_group_settings"
app:showAsAction="collapseActionView" /> 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> </menu>

2
app/src/main/res/values/strings.xml
View File

@ -1921,7 +1921,7 @@
<!-- conversation --> <!-- conversation -->
<string name="conversation__menu_add_attachment">Add attachment</string> <string name="conversation__menu_add_attachment">Add attachment</string>
<string name="conversation__menu_edit_group">Edit group</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_leave_group">Leave group</string>
<string name="conversation__menu_view_all_media">All media</string> <string name="conversation__menu_view_all_media">All media</string>
<string name="conversation__menu_conversation_settings">Conversation settings</string> <string name="conversation__menu_conversation_settings">Conversation settings</string>