From 953f6feb174f050ec4c9b1696d8e479af2946652 Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Thu, 4 Nov 2021 16:23:03 +0200
Subject: [PATCH] For #22155 - The inactiveTabsCount probe reports
 actualInactiveTabs number

---
 app/metrics.yaml                                            | 1 +
 app/src/main/java/org/mozilla/fenix/FenixApplication.kt     | 4 ++--
 app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/metrics.yaml b/app/metrics.yaml
index f5b0d141b..e7a5732b0 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -1258,6 +1258,7 @@ metrics:
     lifetime: application
     description: |
       How many inactive tabs does the user have.
+      Value will be 0 if the feature is disabled.
     send_in_pings:
       - metrics
     bugs:
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index 7cb154fa8..2e651339f 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -80,8 +80,8 @@ import org.mozilla.fenix.components.Core
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MozillaProductDetector
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
+import org.mozilla.fenix.ext.actualInactiveTabs
 import org.mozilla.fenix.perf.MarkersActivityLifecycleCallbacks
-import org.mozilla.fenix.ext.potentialInactiveTabs
 import org.mozilla.fenix.utils.Settings
 
 /**
@@ -628,7 +628,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
             tabViewSetting.set(settings.getTabViewPingString())
             closeTabSetting.set(settings.getTabTimeoutPingString())
 
-            inactiveTabsCount.set(browserStore.state.potentialInactiveTabs.size.toLong())
+            inactiveTabsCount.set(browserStore.state.actualInactiveTabs(settings).size.toLong())
 
             val installSourcePackage = if (SDK_INT >= Build.VERSION_CODES.R) {
                 packageManager.getInstallSourceInfo(packageName).installingPackageName
diff --git a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
index cab85ee42..42842810b 100644
--- a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
@@ -32,8 +32,8 @@ import org.mozilla.fenix.GleanMetrics.Preferences
 import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
 import org.mozilla.fenix.components.metrics.MozillaProductDetector
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
+import org.mozilla.fenix.ext.actualInactiveTabs
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.ext.potentialInactiveTabs
 import org.mozilla.fenix.utils.BrowsersCache
 import org.mozilla.fenix.utils.Settings
 import org.robolectric.annotation.Config
@@ -143,8 +143,8 @@ class FenixApplicationTest {
         every { settings.searchTermTabGroupsAreEnabled } returns true
         every { application.reportHomeScreenMetrics(settings) } just Runs
         every { settings.inactiveTabsAreEnabled } returns true
-        mockkStatic("org.mozilla.fenix.tabstray.ext.TabSelectorsKt") {
-            every { browserStore.state.potentialInactiveTabs } returns listOf(mockk(), mockk())
+        mockkStatic("org.mozilla.fenix.ext.BrowserStateKt") {
+            every { browserStore.state.actualInactiveTabs(any()) } returns listOf(mockk(), mockk())
 
             application.setStartupMetrics(browserStore, settings, browsersCache, mozillaProductDetector)