From b76d95732d65656f9d2e6c1d530327086a198390 Mon Sep 17 00:00:00 2001
From: Elise Richards <erichards@mozilla.com>
Date: Tue, 23 Jun 2020 15:11:19 -0500
Subject: [PATCH] Track events for add to homescreen and install.

---
 app/metrics.yaml                                          | 3 +--
 .../java/org/mozilla/fenix/components/metrics/Metrics.kt  | 1 +
 .../fenix/components/toolbar/BrowserToolbarController.kt  | 8 +++++++-
 .../org/mozilla/fenix/shortcut/FirstTimePwaFragment.kt    | 5 +----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index 9f81a9689716..4e1c138ff6ad 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -2707,8 +2707,7 @@ progressive.web.app:
   install_menu_tap:
     type: event
     description: |
-      A user opens the install PWA menu
-    bugs:
+T    bugs:
       - https://github.com/mozilla-mobile/fenix/issues/10261
     data_reviews:
       - https://github.com/mozilla-mobile/fenix/issues/10261
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
index 3360d56c5650..e9de11b95151 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt
@@ -38,6 +38,7 @@ import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.Logins
 import org.mozilla.fenix.GleanMetrics.PerfAwesomebar
+import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp
 import org.mozilla.fenix.GleanMetrics.SearchShortcuts
 import org.mozilla.fenix.GleanMetrics.Tip
 import org.mozilla.fenix.GleanMetrics.ToolbarSettings
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 b250f53c45c1..0a18864fabf9 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
@@ -35,12 +35,14 @@ import org.mozilla.fenix.components.TopSiteStorage
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
+import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.navigateSafe
 import org.mozilla.fenix.ext.sessionsOfType
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 import org.mozilla.fenix.utils.Do
+import kotlin.coroutines.coroutineContext
 
 /**
  * An interface that handles the view manipulation of the BrowserToolbar, triggered by the Interactor
@@ -162,7 +164,10 @@ class DefaultBrowserToolbarController(
         val settings = activity.settings()
         lowPrioHighlightItems.forEach {
             when (it) {
-                ToolbarMenu.Item.AddToHomeScreen -> settings.installPwaOpened = true
+                ToolbarMenu.Item.AddToHomeScreen -> {
+                    settings.installPwaOpened = true
+                    activity.metrics.track(Event.ProgressiveWebAppInstallMenuTap)
+                }
                 ToolbarMenu.Item.OpenInApp -> settings.openInAppOpened = true
             }
         }
@@ -222,6 +227,7 @@ class DefaultBrowserToolbarController(
                     with(activity.components.useCases.webAppUseCases) {
                         if (isInstallable()) {
                             addToHomescreen()
+                            activity.metrics.track(Event.ProgressiveWebAppAddToHomescreenTap)
                         } else {
                             val directions =
                                 BrowserFragmentDirections.actionBrowserFragmentToCreateShortcutFragment()
diff --git a/app/src/main/java/org/mozilla/fenix/shortcut/FirstTimePwaFragment.kt b/app/src/main/java/org/mozilla/fenix/shortcut/FirstTimePwaFragment.kt
index 7f951d91a95b..c39c4b444f17 100644
--- a/app/src/main/java/org/mozilla/fenix/shortcut/FirstTimePwaFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/shortcut/FirstTimePwaFragment.kt
@@ -40,10 +40,7 @@ class FirstTimePwaFragment : DialogFragment() {
         add_button.setOnClickListener {
             viewLifecycleOwner.lifecycleScope.launch {
                 components.useCases.webAppUseCases.addToHomescreen()
-            }.invokeOnCompletion {
-                requireContext().metrics.track(Event.AddonsOpenInSettings)
-                dismiss()
-            }
+            }.invokeOnCompletion { dismiss() }
         }
     }
 }