For mozilla-mobile#24210: Remove wrapper from home button clicked event.

mcarare · Mar 31, 2022 · f8adcb1 · f8adcb1
1 parent 34635f9
commit f8adcb1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt
@@ -211,9 +211,6 @@ sealed class Event {
     object HomeScreenViewCount : Event()
     object HomeScreenCustomizedHomeClicked : Event()
 
-    // Browser Toolbar
-    object BrowserToolbarHomeButtonClicked : Event()
-
     // Start on Home
     object StartOnHomeEnterHomeScreen : Event()
     object StartOnHomeOpenTabsTray : Event()

diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -625,10 +625,6 @@ private val Event.wrapper: EventWrapper<*>?
             { HomeScreen.customizeHomeClicked.record(it) }
         )
 
-        is Event.BrowserToolbarHomeButtonClicked -> EventWrapper<NoExtraKeys>(
-            { Events.browserToolbarHomeTapped.record(it) }
-        )
-
         is Event.StartOnHomeEnterHomeScreen -> EventWrapper<NoExtraKeys>(
             { StartOnHome.enterHomeScreen.record(it) }
         )

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
@@ -13,6 +13,7 @@ import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.feature.tabs.TabsUseCases
+import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.ktx.kotlin.isUrl
 import mozilla.components.ui.tabcounter.TabCounterMenu
 import org.mozilla.fenix.GleanMetrics.Events
@@ -172,8 +173,7 @@ class DefaultBrowserToolbarController(
     }
 
     override fun handleHomeButtonClick() {
-        metrics.track(Event.BrowserToolbarHomeButtonClicked)
-
+        Events.browserToolbarHomeTapped.record(NoExtras())
         browserAnimator.captureEngineViewAndDrawStatically {
             navController.navigate(
                 BrowserFragmentDirections.actionGlobalHome()

diff --git a/...src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/...src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -47,7 +47,6 @@ import org.mozilla.fenix.browser.BrowserFragmentDirections
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.SimpleBrowsingModeManager
 import org.mozilla.fenix.browser.readermode.ReaderModeController
-import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
@@ -351,11 +350,13 @@ class DefaultBrowserToolbarControllerTest {
 
     @Test
     fun handleHomeButtonClick() {
+        assertFalse(Events.browserToolbarHomeTapped.testHasValue())
+
         val controller = createController()
         controller.handleHomeButtonClick()
 
         verify { navController.navigate(BrowserFragmentDirections.actionGlobalHome()) }
-        verify { metrics.track(Event.BrowserToolbarHomeButtonClicked) }
+        assertTrue(Events.browserToolbarHomeTapped.testHasValue())
     }
 
     private fun createController(