From 2d60d5fb1fb77ee65c8c445a93f570c65b6f32df Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 9 Apr 2020 10:48:11 -0300
Subject: [PATCH] Check menu item visibility when calculating menu size.

---
 .../securesms/util/views/AdaptiveActionsToolbar.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
index ddaa085886..ad0cd617a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/AdaptiveActionsToolbar.java
@@ -61,7 +61,13 @@ public class AdaptiveActionsToolbar extends Toolbar {
   }
 
   public static void adjustMenuActions(@NonNull Menu menu, int maxToShow, int toolbarWidthPx) {
-    int menuSize = menu.size();
+    int menuSize = 0;
+
+    for (int i = 0; i < menu.size(); i++) {
+      if (menu.getItem(i).isVisible()) {
+        menuSize++;
+      }
+    }
 
     int widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP);
     int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));