Bug 2022077 - track debug drawer enabled state based on when the view is shown

Author: MatthewTighe

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/store/DebugDrawerAction.kt

@@ -19,6 +19,8 @@ import org.mozilla.fenix.debugsettings.tabs.TabTools as TabToolsScreen
  */
 sealed class DebugDrawerAction : Action {
 
+    object ViewAppeared : DebugDrawerAction()
+
     /**
      * [DebugDrawerAction] fired when the user opens the drawer.
      */

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/store/DebugDrawerNavigationMiddleware.kt

@@ -60,7 +60,9 @@ class DebugDrawerNavigationMiddleware(
                 is DebugDrawerAction.NavigateTo.LlmDebugTools ->
                     navController.navigate(route = DebugDrawerRoute.LlmTools.route)
                 is DebugDrawerAction.OnBackPressed -> navController.popBackStack()
-                is DebugDrawerAction.DrawerOpened, DebugDrawerAction.DrawerClosed -> Unit // no-op
+                is DebugDrawerAction.DrawerOpened,
+                DebugDrawerAction.DrawerClosed,
+                DebugDrawerAction.ViewAppeared -> Unit // no-op
             }
         }
     }

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/store/DebugDrawerTelemetryMiddleware.kt

@@ -0,0 +1,37 @@
+package org.mozilla.fenix.debugsettings.store
+
+import mozilla.components.lib.state.Middleware
+import mozilla.components.lib.state.Store
+import org.mozilla.fenix.GleanMetrics.DebugDrawer
+
+class DebugDrawerTelemetryMiddleware : Middleware<DebugDrawerState, DebugDrawerAction> {
+    override fun invoke(
+        store: Store<DebugDrawerState, DebugDrawerAction>,
+        next: (DebugDrawerAction) -> Unit,
+        action: DebugDrawerAction,
+    ) {
+        next(action)
+
+        when (action) {
+            DebugDrawerAction.ViewAppeared -> {
+                DebugDrawer.debugDrawerEnabled.set(true)
+            }
+            DebugDrawerAction.DrawerClosed,
+            DebugDrawerAction.DrawerOpened,
+            DebugDrawerAction.NavigateTo.AddonsDebugTools,
+            DebugDrawerAction.NavigateTo.Addresses,
+            DebugDrawerAction.NavigateTo.Autofill,
+            DebugDrawerAction.NavigateTo.CfrTools,
+            DebugDrawerAction.NavigateTo.CrashDebugTools,
+            DebugDrawerAction.NavigateTo.CreditCards,
+            DebugDrawerAction.NavigateTo.GleanDebugTools,
+            DebugDrawerAction.NavigateTo.Home,
+            DebugDrawerAction.NavigateTo.IntegrityDebugTools,
+            DebugDrawerAction.NavigateTo.LlmDebugTools,
+            DebugDrawerAction.NavigateTo.Logins,
+            DebugDrawerAction.NavigateTo.RegionDebugTools,
+            DebugDrawerAction.NavigateTo.TabTools,
+            DebugDrawerAction.OnBackPressed -> Unit
+        }
+    }
+}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/debugsettings/ui/FenixOverlay.kt

@@ -8,6 +8,7 @@ import android.content.Intent
 import android.os.StrictMode
 import android.widget.Toast
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -53,6 +54,7 @@ import org.mozilla.fenix.debugsettings.navigation.DebugDrawerRoute
 import org.mozilla.fenix.debugsettings.store.DebugDrawerAction
 import org.mozilla.fenix.debugsettings.store.DebugDrawerNavigationMiddleware
 import org.mozilla.fenix.debugsettings.store.DebugDrawerStore
+import org.mozilla.fenix.debugsettings.store.DebugDrawerTelemetryMiddleware
 import org.mozilla.fenix.debugsettings.store.DrawerStatus
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.theme.DefaultThemeProvider
@@ -161,10 +163,15 @@ private fun FenixOverlay(
                     navController = navController,
                     scope = coroutineScope,
                 ),
+                DebugDrawerTelemetryMiddleware(),
             ),
         )
     }
 
+    LaunchedEffect(Unit) {
+        debugDrawerStore.dispatch(DebugDrawerAction.ViewAppeared)
+    }
+
     val debugDrawerDestinations = remember {
         DebugDrawerRoute.generateDebugDrawerDestinations(
             debugDrawerStore = debugDrawerStore,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt

@@ -356,7 +356,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
                 onPreferenceChangeListener =
                     Preference.OnPreferenceChangeListener { _, newValue ->
                         debugSettingsRepository.setDebugDrawerEnabled(enabled = newValue as Boolean)
-                        DebugDrawerMetrics.debugDrawerEnabled.set(newValue)
                         true
                     }
             }