From fdafcfa2993a31839746bccb2437f5a95819694a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kozi=C5=84ski?= Date: Wed, 2 Sep 2026 11:32:41 +0200 Subject: [PATCH] Fix focus debug reusing fenix debug state --- app/src/main/AndroidManifest.xml | 1 + .../org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt | 6 ++++++ .../java/org/mozilla/tryfox/data/MozillaPackageManager.kt | 3 +++ .../java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt | 2 +- app/src/main/java/org/mozilla/tryfox/util/Consts.kt | 2 ++ .../mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt | 4 ++++ 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a19a87..dfa16fe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,7 @@ + diff --git a/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt b/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt index c4386e4..0a86507 100644 --- a/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt +++ b/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt @@ -25,6 +25,8 @@ import org.mozilla.tryfox.util.FENIX_RELEASE_PACKAGE import org.mozilla.tryfox.util.FOCUS import org.mozilla.tryfox.util.FOCUS_BETA import org.mozilla.tryfox.util.FOCUS_BETA_PACKAGE +import org.mozilla.tryfox.util.FOCUS_DEBUG +import org.mozilla.tryfox.util.FOCUS_DEBUG_PACKAGE import org.mozilla.tryfox.util.FOCUS_NIGHTLY_PACKAGE import org.mozilla.tryfox.util.FOCUS_RELEASE import org.mozilla.tryfox.util.FOCUS_RELEASE_PACKAGE @@ -87,6 +89,7 @@ class DefaultMozillaPackageManager(private val context: Context) : MozillaPackag FOCUS_NIGHTLY_PACKAGE to FOCUS, FOCUS_BETA_PACKAGE to FOCUS_BETA, FOCUS_RELEASE_PACKAGE to FOCUS_RELEASE, + FOCUS_DEBUG_PACKAGE to FOCUS_DEBUG, REFERENCE_BROWSER_PACKAGE to REFERENCE_BROWSER, TRYFOX_PACKAGE to TRYFOX, ) @@ -112,6 +115,9 @@ class DefaultMozillaPackageManager(private val context: Context) : MozillaPackag override val focusBeta: AppState get() = getAppState(FOCUS_BETA_PACKAGE) + override val focusDebug: AppState + get() = getAppState(FOCUS_DEBUG_PACKAGE) + override val referenceBrowser: AppState get() = getAppState(REFERENCE_BROWSER_PACKAGE) diff --git a/app/src/main/java/org/mozilla/tryfox/data/MozillaPackageManager.kt b/app/src/main/java/org/mozilla/tryfox/data/MozillaPackageManager.kt index 0dbb4cc..b90a72f 100644 --- a/app/src/main/java/org/mozilla/tryfox/data/MozillaPackageManager.kt +++ b/app/src/main/java/org/mozilla/tryfox/data/MozillaPackageManager.kt @@ -39,6 +39,9 @@ interface MozillaPackageManager { /** The [AppState] for Focus Beta. */ val focusBeta: AppState + /** The [AppState] for Focus Debug. */ + val focusDebug: AppState + /** * The [AppState] for Reference Browser. */ diff --git a/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt b/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt index ece771d..860920a 100644 --- a/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt +++ b/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt @@ -302,7 +302,7 @@ class HomeViewModel( FOCUS to mozillaPackageManager.focus, FOCUS_RELEASE to mozillaPackageManager.focusRelease, FOCUS_BETA to mozillaPackageManager.focusBeta, - FOCUS_DEBUG to mozillaPackageManager.fenixDebug, + FOCUS_DEBUG to mozillaPackageManager.focusDebug, REFERENCE_BROWSER to mozillaPackageManager.referenceBrowser, TRYFOX to mozillaPackageManager.tryfox, ) diff --git a/app/src/main/java/org/mozilla/tryfox/util/Consts.kt b/app/src/main/java/org/mozilla/tryfox/util/Consts.kt index c5afdd3..dd156ef 100644 --- a/app/src/main/java/org/mozilla/tryfox/util/Consts.kt +++ b/app/src/main/java/org/mozilla/tryfox/util/Consts.kt @@ -21,6 +21,7 @@ const val FENIX_DEBUG_PACKAGE = "org.mozilla.fenix.debug" const val FOCUS_NIGHTLY_PACKAGE = "org.mozilla.focus.nightly" const val FOCUS_BETA_PACKAGE = "org.mozilla.focus.beta" const val FOCUS_RELEASE_PACKAGE = "org.mozilla.focus" +const val FOCUS_DEBUG_PACKAGE = "org.mozilla.focus.debug" const val REFERENCE_BROWSER_PACKAGE = "org.mozilla.reference.browser" const val TRYFOX_PACKAGE = "org.mozilla.tryfox" @@ -32,5 +33,6 @@ val MOZILLA_PACKAGE_NAMES = listOf( FOCUS_NIGHTLY_PACKAGE, FOCUS_BETA_PACKAGE, FOCUS_RELEASE_PACKAGE, + FOCUS_DEBUG_PACKAGE, REFERENCE_BROWSER_PACKAGE, ) diff --git a/app/src/test/java/org/mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt b/app/src/test/java/org/mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt index 2796202..a44403f 100644 --- a/app/src/test/java/org/mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt +++ b/app/src/test/java/org/mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt @@ -9,6 +9,7 @@ import org.mozilla.tryfox.util.FENIX_DEBUG_PACKAGE import org.mozilla.tryfox.util.FENIX_NIGHTLY_PACKAGE import org.mozilla.tryfox.util.FENIX_RELEASE_PACKAGE import org.mozilla.tryfox.util.FOCUS_BETA_PACKAGE +import org.mozilla.tryfox.util.FOCUS_DEBUG_PACKAGE import org.mozilla.tryfox.util.FOCUS_NIGHTLY_PACKAGE import org.mozilla.tryfox.util.FOCUS_RELEASE_PACKAGE import org.mozilla.tryfox.util.REFERENCE_BROWSER_PACKAGE @@ -45,6 +46,9 @@ class FakeMozillaPackageManager( override val focusBeta: AppState get() = apps[FOCUS_BETA_PACKAGE] ?: AppState("Focus Beta", FOCUS_BETA_PACKAGE, null, null) + override val focusDebug: AppState + get() = apps[FOCUS_DEBUG_PACKAGE] ?: AppState("Focus Debug", FOCUS_DEBUG_PACKAGE, null, null) + override val referenceBrowser: AppState get() = apps[REFERENCE_BROWSER_PACKAGE] ?: AppState("Reference Browser", REFERENCE_BROWSER_PACKAGE, null, null)