From f863c341e81e1b4b894a6d89931cd44e773f0338 Mon Sep 17 00:00:00 2001 From: ekager Date: Thu, 2 Jul 2020 19:35:21 -0400 Subject: [PATCH] Updates AC to 49.0.20200702190156 and fixes breaking changes --- .../java/org/mozilla/fenix/engine/GeckoProvider.kt | 2 +- .../java/org/mozilla/fenix/engine/GeckoProvider.kt | 2 +- .../org/mozilla/fenix/browser/BaseBrowserFragment.kt | 9 +++++---- .../main/java/org/mozilla/fenix/components/Components.kt | 3 +-- .../main/java/org/mozilla/fenix/components/UseCases.kt | 9 +++++---- .../java/org/mozilla/fenix/components/TestComponents.kt | 3 +-- buildSrc/src/main/java/AndroidComponents.kt | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt index ba575199b..fc13e5b00 100644 --- a/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt +++ b/app/src/geckoBeta/java/org/mozilla/fenix/engine/GeckoProvider.kt @@ -55,7 +55,7 @@ object GeckoProvider { } val geckoRuntime = GeckoRuntime.create(context, runtimeSettings) - val loginStorageDelegate = GeckoLoginStorageDelegate(storage, { true }) + val loginStorageDelegate = GeckoLoginStorageDelegate(storage) geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate) return geckoRuntime diff --git a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt b/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt index cbf62d6a4..c5a27fa63 100644 --- a/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt +++ b/app/src/geckoNightly/java/org/mozilla/fenix/engine/GeckoProvider.kt @@ -55,7 +55,7 @@ object GeckoProvider { } val geckoRuntime = GeckoRuntime.create(context, runtimeSettings) - val loginStorageDelegate = GeckoLoginStorageDelegate(storage, { true }) + val loginStorageDelegate = GeckoLoginStorageDelegate(storage) geckoRuntime.loginStorageDelegate = GeckoLoginDelegateWrapper(loginStorageDelegate) return geckoRuntime diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 9ed9985f7..94af3423f 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -466,8 +466,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session sessionFeature.set( feature = SessionFeature( - sessionManager, - SessionUseCases(sessionManager), + requireComponents.core.store, + requireComponents.useCases.sessionUseCases.goBack, + requireComponents.useCases.engineSessionUseCases, view.engineView, customTabSessionId ), @@ -517,7 +518,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session fullScreenFeature.set( feature = FullScreenFeature( - sessionManager, + requireComponents.core.store, SessionUseCases(sessionManager), customTabSessionId, ::viewportFitChange, @@ -563,7 +564,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session view.swipeRefresh.setColorSchemeColors(primaryTextColor) swipeRefreshFeature.set( feature = SwipeRefreshFeature( - sessionManager, + requireComponents.core.store, context.components.useCases.sessionUseCases.reload, view.swipeRefresh, customTabSessionId diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt index 7d0437521..b93e78517 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Components.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt @@ -51,8 +51,7 @@ class Components(private val context: Context) { core.sessionManager, core.store, search.searchEngineManager, - core.webAppShortcutManager, - core.thumbnailStorage + core.webAppShortcutManager ) } val intentProcessors by lazy { diff --git a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt index d247d0276..c40cbc901 100644 --- a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt +++ b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt @@ -7,8 +7,8 @@ package org.mozilla.fenix.components import android.content.Context import mozilla.components.browser.search.SearchEngineManager import mozilla.components.browser.session.SessionManager +import mozilla.components.browser.session.usecases.EngineSessionUseCases import mozilla.components.browser.state.store.BrowserStore -import mozilla.components.browser.thumbnails.storage.ThumbnailStorage import mozilla.components.concept.engine.Engine import mozilla.components.feature.app.links.AppLinksUseCases import mozilla.components.feature.contextmenu.ContextMenuUseCases @@ -32,8 +32,7 @@ class UseCases( private val sessionManager: SessionManager, private val store: BrowserStore, private val searchEngineManager: SearchEngineManager, - private val shortcutManager: WebAppShortcutManager, - private val thumbnailStorage: ThumbnailStorage + private val shortcutManager: WebAppShortcutManager ) { /** * Use cases that provide engine interactions for a given browser session. @@ -53,7 +52,7 @@ class UseCases( /** * Use cases that provide settings management. */ - val settingsUseCases by lazy { SettingsUseCases(engine, sessionManager) } + val settingsUseCases by lazy { SettingsUseCases(engine, store) } val appLinksUseCases by lazy { AppLinksUseCases(context.applicationContext) } @@ -64,4 +63,6 @@ class UseCases( val downloadUseCases by lazy { DownloadsUseCases(store) } val contextMenuUseCases by lazy { ContextMenuUseCases(sessionManager, store) } + + val engineSessionUseCases by lazy { EngineSessionUseCases(sessionManager) } } diff --git a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt index 576b67bdb..8822d2d4c 100644 --- a/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt +++ b/app/src/test/java/org/mozilla/fenix/components/TestComponents.kt @@ -22,8 +22,7 @@ class TestComponents(private val context: Context) : Components(context) { core.sessionManager, core.store, search.searchEngineManager, - core.webAppShortcutManager, - core.thumbnailStorage + core.webAppShortcutManager ) } override val intentProcessors by lazy { mockk(relaxed = true) } diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index da0138eac..402ba5e65 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "49.0.20200702131412" + const val VERSION = "49.0.20200702190156" }