1
0
Fork 0

Updates AC to 49.0.20200702190156 and fixes breaking changes

master
ekager 2020-07-02 19:35:21 -04:00 committed by Emily Kager
parent 8533d96ee2
commit f863c341e8
7 changed files with 15 additions and 15 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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) }
}

View File

@ -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<IntentProcessors>(relaxed = true) }

View File

@ -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"
}