Skip to content

Fix focus debug reusing fenix debug state #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
titooan merged 1 commit into from
Sep 2, 2026
Merged

Fix focus debug reusing fenix debug state #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<package android:name="org.mozilla.focus.nightly" />
<package android:name="org.mozilla.focus" />
<package android:name="org.mozilla.focus.beta" />
<package android:name="org.mozilla.focus.debug" />
<package android:name="org.mozilla.firefox" />
<package android:name="org.mozilla.firefox_beta" />
<package android:name="org.mozilla.reference.browser" />
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
Expand All @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/org/mozilla/tryfox/data/MozillaPackageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/mozilla/tryfox/util/Consts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -32,5 +33,6 @@ val MOZILLA_PACKAGE_NAMES = listOf(
FOCUS_NIGHTLY_PACKAGE,
FOCUS_BETA_PACKAGE,
FOCUS_RELEASE_PACKAGE,
FOCUS_DEBUG_PACKAGE,
REFERENCE_BROWSER_PACKAGE,
)
4 changes: 4 additions & 0 deletions app/src/test/java/org/mozilla/tryfox/ui/screens/FakeMozillaPackageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
Loading