From 21fae7e7998f51dbc60dbe515d77b59678ecbc27 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 19 May 2024 21:33:14 +0200 Subject: [PATCH] fix ConversationAdaptiveActionsToolbar --- .../util/views/ConversationAdaptiveActionsToolbar.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java index bd3e7b185..d0c82c250 100644 --- a/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java +++ b/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java @@ -25,10 +25,8 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { private static final int ID_NEVER_SHOW_AS_ACTION_1 = R.id.menu_context_reply_privately; private static final int ID_NEVER_SHOW_AS_ACTION_2 = R.id.menu_context_save_attachment; - private static final int ID_NEVER_SHOW_AS_ACTION_3 = R.id.menu_context_remove_contact; - private static final int ID_NEVER_SHOW_AS_ACTION_4 = R.id.menu_context_add_contact; - private static final int ID_NEVER_SHOW_AS_ACTION_5 = R.id.menu_resend; - private static final int ID_NEVER_SHOW_AS_ACTION_6 = R.id.menu_add_to_home_screen; + private static final int ID_NEVER_SHOW_AS_ACTION_3 = R.id.menu_resend; + private static final int ID_NEVER_SHOW_AS_ACTION_4 = R.id.menu_add_to_home_screen; private static final int ID_ALWAYS_SHOW_AS_ACTION = R.id.menu_context_forward; private final int maxShown; @@ -85,9 +83,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { boolean neverShowAsAction = item.getItemId() == ID_NEVER_SHOW_AS_ACTION_1 || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_2 || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_3 - || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_4 - || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_5 - || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_6; + || item.getItemId() == ID_NEVER_SHOW_AS_ACTION_4; boolean alwaysShowAsAction = item.getItemId() == ID_ALWAYS_SHOW_AS_ACTION; if (alwaysShowAsAction) continue;