From 3589957678a25ced30d2182c7ded03f9103bbd52 Mon Sep 17 00:00:00 2001
From: Ionut Cristian Bedregeanu <ionut.bedregeanu@softvision.ro>
Date: Thu, 30 Jun 2022 14:37:19 +0300
Subject: [PATCH] [focus] For
 https://github.com/mozilla-mobile/focus-android/issues/7143 - Record tracking
 protection cfr exposure only once

---
 .../mozilla/focus/browser/integration/BrowserToolbarIntegration.kt  | 2 --
 .../app/src/main/java/org/mozilla/focus/cfr/CfrMiddleware.kt        | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
index 0779a3d27ae4..bdcbbe2b8e7a 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/BrowserToolbarIntegration.kt
@@ -38,7 +38,6 @@ import org.mozilla.focus.ext.isTablet
 import org.mozilla.focus.ext.settings
 import org.mozilla.focus.fragment.BrowserFragment
 import org.mozilla.focus.menu.browser.CustomTabMenu
-import org.mozilla.focus.nimbus.FocusNimbus
 import org.mozilla.focus.state.AppAction
 import org.mozilla.focus.telemetry.TelemetryWrapper
 
@@ -261,7 +260,6 @@ class BrowserToolbarIntegration(
                 .ifChanged()
                 .collect { showTrackingProtectionCfrForTab ->
                     if (showTrackingProtectionCfrForTab[store.state.selectedTabId] == true) {
-                        FocusNimbus.features.onboarding.recordExposure()
                         CFRPopup(
                             container = fragment.requireView(),
                             text = fragment.getString(R.string.cfr_for_toolbar_shield_icon),
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/cfr/CfrMiddleware.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/cfr/CfrMiddleware.kt
index 2507bbd1bd6b..fc0ecf461cdd 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/cfr/CfrMiddleware.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/cfr/CfrMiddleware.kt
@@ -28,6 +28,7 @@ class CfrMiddleware(private val appContext: Context) : Middleware<BrowserState,
     private lateinit var onboardingConfig: Onboarding
     private val components = appContext.components
     private var isCurrentTabSecure = false
+    private var tpExposureAlreadyRecorded = false
 
     override fun invoke(
         context: MiddlewareContext<BrowserState, BrowserAction>,
@@ -54,6 +55,11 @@ class CfrMiddleware(private val appContext: Context) : Middleware<BrowserState,
         }
 
         if (shouldShowCfrForTrackingProtection(action = action, browserState = context.state)) {
+            if (!tpExposureAlreadyRecorded) {
+                FocusNimbus.features.onboarding.recordExposure()
+                tpExposureAlreadyRecorded = true
+            }
+
             components.appStore.dispatch(
                 AppAction.ShowTrackingProtectionCfrChange(
                     mapOf(
-- 
2.11.4.GIT