From dd85229c416316edda91b7b1d5b4289dbef28240 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Thu, 12 Sep 2019 15:25:35 +0200 Subject: [PATCH] Use new feature-downloads API. --- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 6 ++++-- app/src/main/java/org/mozilla/fenix/components/UseCases.kt | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 944a53b09..b1617940a 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -150,6 +150,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs protected open fun initializeUI(view: View): Session? { val context = requireContext() val sessionManager = context.components.core.sessionManager + val store = context.components.core.store return getSessionById()?.also { session -> @@ -240,9 +241,10 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs downloadsFeature.set( feature = DownloadsFeature( context.applicationContext, - sessionManager = sessionManager, + store = store, + useCases = context.components.useCases.downloadUseCases, fragmentManager = childFragmentManager, - sessionId = customTabSessionId, + customTabId = customTabSessionId, downloadManager = FetchDownloadManager( context.applicationContext, DownloadService::class 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 8baeaf6d0..0076d8e8e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/UseCases.kt +++ b/app/src/main/java/org/mozilla/fenix/components/UseCases.kt @@ -10,6 +10,7 @@ import mozilla.components.browser.session.SessionManager import mozilla.components.concept.engine.Settings import mozilla.components.concept.fetch.Client import mozilla.components.feature.app.links.AppLinksUseCases +import mozilla.components.feature.downloads.DownloadsUseCases import mozilla.components.feature.pwa.WebAppUseCases import mozilla.components.feature.search.SearchUseCases import mozilla.components.feature.session.SessionUseCases @@ -52,4 +53,6 @@ class UseCases( val appLinksUseCases by lazy { AppLinksUseCases(context.applicationContext) } val webAppUseCases by lazy { WebAppUseCases(context, sessionManager, httpClient, supportWebApps = false) } + + val downloadUseCases by lazy { DownloadsUseCases(sessionManager) } }