No issue: Removes session time out related code
parent
3046efbde2
commit
7871225083
|
@ -19,7 +19,6 @@ import androidx.navigation.ui.AppBarConfiguration
|
|||
import androidx.navigation.ui.NavigationUI
|
||||
import mozilla.components.browser.search.SearchEngine
|
||||
import mozilla.components.browser.session.Session
|
||||
import mozilla.components.browser.session.SessionManager
|
||||
import mozilla.components.concept.engine.EngineView
|
||||
import mozilla.components.feature.intent.IntentProcessor
|
||||
import mozilla.components.lib.crash.Crash
|
||||
|
@ -39,8 +38,6 @@ import org.mozilla.fenix.settings.SettingsFragmentDirections
|
|||
@SuppressWarnings("TooManyFunctions")
|
||||
open class HomeActivity : AppCompatActivity() {
|
||||
open val isCustomTab = false
|
||||
private var sessionObserver: SessionManager.Observer? = null
|
||||
var allSessionsRemoved = false
|
||||
|
||||
val themeManager = DefaultThemeManager().also {
|
||||
it.onThemeChange = { theme ->
|
||||
|
@ -57,7 +54,6 @@ open class HomeActivity : AppCompatActivity() {
|
|||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
sessionObserver = subscribeToSessions()
|
||||
|
||||
themeManager.temporaryThemeManagerStorage =
|
||||
when (PreferenceManager.getDefaultSharedPreferences(this)
|
||||
|
@ -94,22 +90,9 @@ open class HomeActivity : AppCompatActivity() {
|
|||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
// All sessions have been removed; we should try to pop inclusive to browser if not in private mode
|
||||
if (allSessionsRemoved && !browsingModeManager.isPrivate) {
|
||||
navHost.navController.popBackStack(R.id.browserFragment, true)
|
||||
allSessionsRemoved = false
|
||||
}
|
||||
|
||||
showSoftwareKeyboardIfNecessary()
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
super.onDestroy()
|
||||
sessionObserver?.let {
|
||||
components.core.sessionManager.unregister(it)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNewIntent(intent: Intent?) {
|
||||
super.onNewIntent(intent)
|
||||
handleCrashIfNecessary(intent)
|
||||
|
@ -233,17 +216,6 @@ open class HomeActivity : AppCompatActivity() {
|
|||
}
|
||||
}
|
||||
|
||||
private fun subscribeToSessions(): SessionManager.Observer {
|
||||
val observer = object : SessionManager.Observer {
|
||||
override fun onAllSessionsRemoved() {
|
||||
super.onAllSessionsRemoved()
|
||||
allSessionsRemoved = true
|
||||
}
|
||||
}
|
||||
components.core.sessionManager.register(observer)
|
||||
return observer
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val OPEN_TO_BROWSER = "open_to_browser"
|
||||
}
|
||||
|
|
|
@ -164,8 +164,4 @@ class Core(private val context: Context) {
|
|||
else -> PreferredColorScheme.Light
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val BUNDLE_LIFETIME_IN_MINUTES = 5L
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue