From 0d183b01f33ef45b7e9202b859f2d60ca2f8c5d5 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Wed, 17 Apr 2019 16:13:26 -0700 Subject: [PATCH] For #1696 - Replace session bundle storage with session storage --- app/src/main/java/org/mozilla/fenix/components/Core.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 09e2786eaf..a5c2fe0568 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -76,9 +76,8 @@ class Core(private val context: Context) { GeckoViewFetchClient(context, runtime) } - val sessionStorage: SessionBundleStorage by lazy { - SessionBundleStorage(context, bundleLifetime = Pair(BUNDLE_LIFETIME_IN_MINUTES, TimeUnit.MINUTES), - engine = engine) + val sessionStorage: SessionStorage by lazy { + SessionStorage(context, engine = engine) } /** @@ -92,7 +91,7 @@ class Core(private val context: Context) { // Restore a previous, still active bundle. GlobalScope.launch(Dispatchers.Main) { val snapshot = async(Dispatchers.IO) { - sessionStorage.restore()?.restoreSnapshot() + sessionStorage.restore() } // There's an active bundle with a snapshot: Feed it into the SessionManager. @@ -111,7 +110,6 @@ class Core(private val context: Context) { .periodicallyInForeground(interval = 30, unit = TimeUnit.SECONDS) .whenGoingToBackground() .whenSessionsChange() - autoClose(sessionManager) } } }