For #8153 - Allow web-extensions to open tabs in correct browsing mode
parent
dfde37baf5
commit
cbad832b19
|
@ -38,6 +38,7 @@ import org.mozilla.fenix.ext.settings
|
||||||
import org.mozilla.fenix.session.NotificationSessionObserver
|
import org.mozilla.fenix.session.NotificationSessionObserver
|
||||||
import org.mozilla.fenix.session.VisibilityLifecycleCallback
|
import org.mozilla.fenix.session.VisibilityLifecycleCallback
|
||||||
import org.mozilla.fenix.utils.BrowsersCache
|
import org.mozilla.fenix.utils.BrowsersCache
|
||||||
|
import org.mozilla.fenix.utils.Settings
|
||||||
|
|
||||||
@SuppressLint("Registered")
|
@SuppressLint("Registered")
|
||||||
@Suppress("TooManyFunctions")
|
@Suppress("TooManyFunctions")
|
||||||
|
@ -293,7 +294,12 @@ open class FenixApplication : LocaleAwareApplication() {
|
||||||
components.core.store,
|
components.core.store,
|
||||||
onNewTabOverride = {
|
onNewTabOverride = {
|
||||||
_, engineSession, url ->
|
_, 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)
|
components.core.sessionManager.add(session, true, engineSession)
|
||||||
session.id
|
session.id
|
||||||
},
|
},
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
package org.mozilla.fenix.settings
|
package org.mozilla.fenix.settings
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
|
||||||
import androidx.preference.Preference
|
import androidx.preference.Preference
|
||||||
import androidx.preference.PreferenceFragmentCompat
|
import androidx.preference.PreferenceFragmentCompat
|
||||||
import androidx.preference.SwitchPreference
|
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.getPreferenceKey
|
||||||
import org.mozilla.fenix.ext.metrics
|
import org.mozilla.fenix.ext.metrics
|
||||||
import org.mozilla.fenix.ext.showToolbar
|
import org.mozilla.fenix.ext.showToolbar
|
||||||
import org.mozilla.fenix.utils.Settings
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lets the user customize Private browsing options.
|
* Lets the user customize Private browsing options.
|
||||||
|
|
|
@ -29,7 +29,6 @@ import org.mozilla.fenix.BrowserDirection
|
||||||
import org.mozilla.fenix.HomeActivity
|
import org.mozilla.fenix.HomeActivity
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
|
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.FenixSnackbar
|
||||||
import org.mozilla.fenix.components.Services
|
import org.mozilla.fenix.components.Services
|
||||||
import org.mozilla.fenix.components.metrics.Event
|
import org.mozilla.fenix.components.metrics.Event
|
||||||
|
@ -48,7 +47,6 @@ class BookmarkControllerTest {
|
||||||
|
|
||||||
private val homeActivity: HomeActivity = mockk(relaxed = true)
|
private val homeActivity: HomeActivity = mockk(relaxed = true)
|
||||||
private val services: Services = mockk(relaxed = true)
|
private val services: Services = mockk(relaxed = true)
|
||||||
private val browsingModeManager: DefaultBrowsingModeManager = mockk(relaxed = true)
|
|
||||||
|
|
||||||
private val item =
|
private val item =
|
||||||
BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null)
|
BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0, "Mozilla", "http://mozilla.org", null)
|
||||||
|
@ -85,8 +83,6 @@ class BookmarkControllerTest {
|
||||||
"org.mozilla.fenix.ext.ContextKt"
|
"org.mozilla.fenix.ext.ContextKt"
|
||||||
)
|
)
|
||||||
|
|
||||||
every { homeActivity.components.browsingModeManager } returns browsingModeManager
|
|
||||||
|
|
||||||
every { homeActivity.components.services } returns services
|
every { homeActivity.components.services } returns services
|
||||||
every { navController.currentDestination } returns NavDestination("").apply {
|
every { navController.currentDestination } returns NavDestination("").apply {
|
||||||
id = R.id.bookmarkFragment
|
id = R.id.bookmarkFragment
|
||||||
|
|
Loading…
Reference in New Issue