Allow onPause in base fragment to send telemetry for PWA in the exter…

…nal app fragment. Track foreground and bg locally in fenix, and route install and home screen taps from AC facts
mozilla-mobile · Jul 28, 2020 · 2214d0b · 2214d0b
1 parent 3cef53d
commit 2214d0b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -737,7 +737,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     }
 
     @CallSuper
-    final override fun onPause() {
+    override fun onPause() {
         super.onPause()
         if (findNavController().currentDestination?.id != R.id.searchFragment) {
             view?.hideKeyboard()

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
@@ -605,18 +605,6 @@ private fun Fact.toEvent(): Event? = when (Pair(component, item)) {
     Component.FEATURE_PWA to ProgressiveWebAppFacts.Items.INSTALL_SHORTCUT -> {
         Event.ProgressiveWebAppInstallAsShortcut
     }
-    Component.FEATURE_PWA to ProgressiveWebAppFacts.Items.ENTER_BACKGROUND -> {
-        metadata?.get(ProgressiveWebAppFacts.MetadataKeys.BACKGROUND_TIME)?.let { duration ->
-            require(duration is Long) { "Expected duration to be a Long" }
-            Event.ProgressiveWebAppBackground(duration)
-        }
-    }
-    Component.FEATURE_PWA to ProgressiveWebAppFacts.Items.ENTER_FOREGROUND -> {
-        metadata?.get(ProgressiveWebAppFacts.MetadataKeys.FOREGROUND_TIME)?.let { duration ->
-            require(duration is Long) { "Expected duration to be a Long" }
-            Event.ProgressiveWebAppForeground(duration)
-        }
-    }
     else -> null
 }
 

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.customtabs
 
 import android.content.Context
 import android.content.Intent
+import android.os.SystemClock
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.navigation.fragment.navArgs
@@ -139,7 +140,6 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
                             )
                         )
                     )
-                    activity.metrics.track(Event.ProgressiveWebAppOpenFromHomescreenTap)
                 } else {
                     viewLifecycleOwner.lifecycle.addObserver(
                         PoweredByNotification(
@@ -153,6 +153,22 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        val currTimeMs = SystemClock.elapsedRealtimeNanos() / MS_PRECISION
+        requireComponents.analytics.metrics.track(
+            Event.ProgressiveWebAppForeground(currTimeMs)
+        )
+    }
+
+    override fun onPause() {
+        super.onPause()
+        val currTimeMs = SystemClock.elapsedRealtimeNanos() / MS_PRECISION
+        requireComponents.analytics.metrics.track(
+            Event.ProgressiveWebAppBackground(currTimeMs)
+        )
+    }
+
     override fun removeSessionIfNeeded(): Boolean {
         return customTabsIntegration.onBackPressed() || super.removeSessionIfNeeded()
     }
@@ -195,4 +211,9 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
         view,
         FenixSnackbarDelegate(view)
     )
+
+    companion object {
+        // We only care about millisecond precision for telemetry events
+        internal const val MS_PRECISION = 1_000_000L
+    }
 }