Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 19:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always recalculate shown items when we update menu state in multiselect.

Browse Source
This commit is contained in:
Alex Hart
2021-08-23 10:40:40 -03:00
parent 7a1122b3f7
commit 6a5c234408
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -793,7 +793,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
});
}
private void setCorrectMenuVisibility(@NonNull Menu menu) {
private void setCorrectActionModeMenuVisibility(@NonNull Menu menu) {
Set<MultiselectPart> selectedParts = getListAdapter().getSelectedItems();
if (actionMode != null && selectedParts.size() == 0) {
@@ -810,6 +810,8 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
menu.findItem(R.id.menu_context_resend).setVisible(menuState.shouldShowResendAction());
menu.findItem(R.id.menu_context_copy).setVisible(menuState.shouldShowCopyAction());
menu.findItem(R.id.menu_context_delete_message).setVisible(menuState.shouldShowDeleteAction());
AdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
}
private @Nullable ConversationAdapter getListAdapter() {
@@ -1388,7 +1390,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
if (getListAdapter().getSelectedItems().size() == 0) {
actionMode.finish();
} else {
setCorrectMenuVisibility(actionMode.getMenu());
setCorrectActionModeMenuVisibility(actionMode.getMenu());
actionMode.setTitle(calculateSelectedItemCount());
}
}
@@ -1878,8 +1880,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
WindowUtil.setLightStatusBar(getActivity().getWindow());
}
setCorrectMenuVisibility(menu);
AdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
setCorrectActionModeMenuVisibility(menu);
listener.onMessageActionToolbarOpened();
return true;
}