From 8f0325c05bd36d34bda7428dd6854e43f53a698e Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Thu, 10 Oct 2019 16:37:47 +0300
Subject: [PATCH] For #3584 - Check if menu is open before showing a new one
 (#5674)

Could have implemented this check (if menu is showing) inside the show() method
of BrowserMenu but this would mean the client (us) would go to the process of
building a new menu and then trying to have it displayed only for this to be
ignored by BrowserMenu in a somewhat opaque way.
Having this check done as soon as possible offers us full control and avoids
the unnecessary steps for building an already shown menu.
---
 .../org/mozilla/fenix/home/HomeFragment.kt     | 18 +++++++++++++-----
 .../viewholders/TabHeaderViewHolder.kt         | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 78341e47e..863e0dce2 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -245,11 +245,19 @@ class HomeFragment : Fragment() {
             }
         }
 
-        view.menuButton.setOnClickListener {
-            homeMenu?.menuBuilder?.build(requireContext())?.show(
-                anchor = it,
-                orientation = BrowserMenu.Orientation.DOWN
-            )
+        with(view.menuButton) {
+            var menu: PopupWindow? = null
+            setOnClickListener {
+                if (menu == null) {
+                    menu = homeMenu?.menuBuilder?.build(requireContext())?.show(
+                        anchor = it,
+                        orientation = BrowserMenu.Orientation.DOWN,
+                        onDismiss = { menu = null }
+                    )
+                } else {
+                    menu?.dismiss()
+                }
+            }
         }
         view.toolbar.compoundDrawablePadding =
             view.resources.getDimensionPixelSize(R.dimen.search_bar_search_engine_icon_padding)
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt
index 30afbe2df..bab540d29 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabHeaderViewHolder.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders
 
 import android.content.Context
 import android.view.View
+import android.widget.PopupWindow
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.reactivex.Observer
@@ -55,10 +56,19 @@ class TabHeaderViewHolder(
             }
 
             tabs_overflow_button.run {
+                var menu: PopupWindow? = null
                 setOnClickListener {
-                    tabsMenu.menuBuilder
-                        .build(view.context)
-                        .show(anchor = it, orientation = BrowserMenu.Orientation.DOWN)
+                    if (menu == null) {
+                        menu = tabsMenu.menuBuilder
+                            .build(view.context)
+                            .show(
+                                anchor = it,
+                                orientation = BrowserMenu.Orientation.DOWN,
+                                onDismiss = { menu = null }
+                            )
+                    } else {
+                        menu?.dismiss()
+                    }
                 }
             }
         }