From 3c2c7f705cb03895dcb090ae98fa9718cdeeef69 Mon Sep 17 00:00:00 2001
From: Mihai Branescu <branescu.mihai@gmail.com>
Date: Thu, 25 Jun 2020 00:01:12 +0300
Subject: [PATCH] For #10467 - blue dot doesn't disappear on menu dismiss

---
 .../fenix/components/toolbar/BrowserInteractor.kt     |  4 ----
 .../components/toolbar/BrowserToolbarController.kt    | 11 -----------
 .../fenix/components/toolbar/BrowserToolbarView.kt    |  2 --
 .../fenix/components/toolbar/DefaultToolbarMenu.kt    | 11 -----------
 4 files changed, 28 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserInteractor.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserInteractor.kt
index 4707a0830..ff37eba46 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserInteractor.kt
@@ -32,10 +32,6 @@ open class BrowserInteractor(
         browserToolbarController.handleToolbarItemInteraction(item)
     }
 
-    override fun onBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>) {
-        browserToolbarController.handleBrowserMenuDismissed(lowPrioHighlightItems)
-    }
-
     override fun onScrolled(offset: Int) {
         browserToolbarController.handleScroll(offset)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index b250f53c4..dc807175e 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -53,7 +53,6 @@ interface BrowserToolbarController {
     fun handleToolbarClick()
     fun handleTabCounterClick()
     fun handleTabCounterItemInteraction(item: TabCounterMenuItem)
-    fun handleBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>)
     fun handleReaderModePressed(enabled: Boolean)
 }
 
@@ -158,16 +157,6 @@ class DefaultBrowserToolbarController(
         }
     }
 
-    override fun handleBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>) {
-        val settings = activity.settings()
-        lowPrioHighlightItems.forEach {
-            when (it) {
-                ToolbarMenu.Item.AddToHomeScreen -> settings.installPwaOpened = true
-                ToolbarMenu.Item.OpenInApp -> settings.openInAppOpened = true
-            }
-        }
-    }
-
     override fun handleScroll(offset: Int) {
         engineView.setVerticalClipping(offset)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
index 130172300..1b6e64e5c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@@ -50,7 +50,6 @@ interface BrowserToolbarViewInteractor {
     fun onBrowserToolbarMenuItemTapped(item: ToolbarMenu.Item)
     fun onTabCounterClicked()
     fun onTabCounterMenuItemTapped(item: TabCounterMenuItem)
-    fun onBrowserMenuDismissed(lowPrioHighlightItems: List<ToolbarMenu.Item>)
     fun onScrolled(offset: Int)
     fun onReaderModePressed(enabled: Boolean)
 }
@@ -229,7 +228,6 @@ class BrowserToolbarView(
                     bookmarksStorage = bookmarkStorage
                 )
                 view.display.setMenuDismissAction {
-                    interactor.onBrowserMenuDismissed(menuToolbar.getLowPrioHighlightItems())
                     view.invalidateActions()
                 }
             }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 3ad4957d3..bc0e49ae5 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -137,17 +137,6 @@ class DefaultToolbarMenu(
         BrowserMenuItemToolbar(listOf(bookmark, share, forward, refresh))
     }
 
-    internal fun getLowPrioHighlightItems(): List<ToolbarMenu.Item> {
-        val lowPrioHighlightItems: MutableList<ToolbarMenu.Item> = mutableListOf()
-        if (canInstall() && installToHomescreen.isHighlighted()) {
-            lowPrioHighlightItems.add(ToolbarMenu.Item.InstallToHomeScreen)
-        }
-        if (shouldShowOpenInApp() && openInApp.isHighlighted()) {
-            lowPrioHighlightItems.add(ToolbarMenu.Item.OpenInApp)
-        }
-        return lowPrioHighlightItems
-    }
-
     // Predicates that need to be repeatedly called as the session changes
     private fun canAddToHomescreen(): Boolean =
         session != null && context.components.useCases.webAppUseCases.isPinningSupported() &&