diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index b99e924e9..52b483131 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -38,6 +38,7 @@ import org.mozilla.fenix.ext.settings import org.mozilla.fenix.session.NotificationSessionObserver import org.mozilla.fenix.session.VisibilityLifecycleCallback import org.mozilla.fenix.utils.BrowsersCache +import org.mozilla.fenix.utils.Settings @SuppressLint("Registered") @Suppress("TooManyFunctions") @@ -293,7 +294,12 @@ open class FenixApplication : LocaleAwareApplication() { components.core.store, onNewTabOverride = { _, engineSession, url -> - val session = Session(url) + val shouldCreatePrivateSession = + components.core.sessionManager.selectedSession?.private + ?: Settings.instance?.openLinksInAPrivateTab + ?: false + + val session = Session(url, shouldCreatePrivateSession) components.core.sessionManager.add(session, true, engineSession) session.id }, diff --git a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt index 85793e152..05355f6d3 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/PrivateBrowsingFragment.kt @@ -5,7 +5,6 @@ package org.mozilla.fenix.settings import android.os.Bundle -import android.util.Log import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreference @@ -15,7 +14,6 @@ import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.utils.Settings /** * Lets the user customize Private browsing options. diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt index 294bb1d56..ccedd1973 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt @@ -29,7 +29,6 @@ import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.browser.browsingmode.DefaultBrowsingModeManager import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.Services import org.mozilla.fenix.components.metrics.Event @@ -48,7 +47,6 @@ class BookmarkControllerTest { private val homeActivity: HomeActivity = mockk(relaxed = true) private val services: Services = mockk(relaxed = true) - private val browsingModeManager: DefaultBrowsingModeManager = mockk(relaxed = true) private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null) @@ -85,8 +83,6 @@ class BookmarkControllerTest { "org.mozilla.fenix.ext.ContextKt" ) - every { homeActivity.components.browsingModeManager } returns browsingModeManager - every { homeActivity.components.services } returns services every { navController.currentDestination } returns NavDestination("").apply { id = R.id.bookmarkFragment