Conditionally shown sub menu icons

4 years ago · 93bdc345f4
parent baf122c261
commit 93bdc345f4
1 changed files with 4 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
+++ b/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
@ -91,12 +91,15 @@ public class PopupMenuLifecycle extends PopupMenu implements LifecycleObserver {
            insertIcon(context, item);
            if (item.hasSubMenu()) {
                SubMenu sub = item.getSubMenu();
-                sub.setHeaderTitle(title);
+                boolean has = false;
                for (int j = 0; j < sub.size(); j++)
                    if (sub.getItem(j).getIcon() != null) {
+                        has = true;
                        insertIcons(context, sub);
                        break;
                    }
+                if (has)
+                    sub.setHeaderTitle(title);
            }
        }
    }