From 8bf1aeeca8be11d5de2efaac838fc6afd68ceef0 Mon Sep 17 00:00:00 2001 From: rahulsainani Date: Thu, 11 May 2023 10:49:59 +0200 Subject: [PATCH] Bug 1830304 - Set browsing mode when redesigned onboarding is enabled --- app/src/main/java/org/mozilla/fenix/home/Mode.kt | 3 ++- app/src/test/java/org/mozilla/fenix/home/ModeTest.kt | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/Mode.kt b/app/src/main/java/org/mozilla/fenix/home/Mode.kt index a4cd3eeb47..bce9afde67 100644 --- a/app/src/main/java/org/mozilla/fenix/home/Mode.kt +++ b/app/src/main/java/org/mozilla/fenix/home/Mode.kt @@ -40,8 +40,9 @@ class CurrentMode( ) : AccountObserver { private val accountManager by lazy { context.components.backgroundServices.accountManager } + private val settings by lazy { context.components.settings } - fun getCurrentMode() = if (onboarding.userHasBeenOnboarded()) { + fun getCurrentMode() = if (onboarding.userHasBeenOnboarded() || settings.junoOnboardingEnabled) { Mode.fromBrowsingMode(browsingModeManager.mode) } else { val account = accountManager.authenticatedAccount() diff --git a/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt b/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt index cbf19db7cd..a14b40f65a 100644 --- a/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/ModeTest.kt @@ -67,6 +67,15 @@ class ModeTest { assertEquals(Mode.Private, currentMode.getCurrentMode()) } + @Test + fun `get current browsing mode when userHasBeenOnboarded is false and juno onboarding is enabled`() { + every { onboarding.userHasBeenOnboarded() } returns false + every { context.components.settings.junoOnboardingEnabled } returns true + every { browsingModeManager.mode } returns BrowsingMode.Normal + + assertEquals(Mode.Normal, currentMode.getCurrentMode()) + } + @Test fun `get current onboarding mode when signed in`() { every { onboarding.userHasBeenOnboarded() } returns false