From a65f220b397fc418f0aa0c36cfd3650b73ff29c5 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Tue, 27 Aug 2019 11:24:46 -0700 Subject: [PATCH] For #4921 - Adds WindowFeature to BaseBrowserFragment --- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 8 ++++++++ .../org/mozilla/fenix/library/history/HistoryFragment.kt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 366791e03..6e81763d5 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -41,6 +41,7 @@ import mozilla.components.feature.session.FullScreenFeature import mozilla.components.feature.session.SessionFeature import mozilla.components.feature.session.SessionUseCases import mozilla.components.feature.session.SwipeRefreshFeature +import mozilla.components.feature.session.WindowFeature import mozilla.components.feature.sitepermissions.SitePermissions import mozilla.components.feature.sitepermissions.SitePermissionsFeature import mozilla.components.feature.sitepermissions.SitePermissionsRules @@ -85,6 +86,7 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs protected lateinit var browserToolbarView: BrowserToolbarView private val sessionFeature = ViewBoundFeatureWrapper() + private val windowFeature = ViewBoundFeatureWrapper() private val contextMenuFeature = ViewBoundFeatureWrapper() private val downloadsFeature = ViewBoundFeatureWrapper() private val appLinksFeature = ViewBoundFeatureWrapper() @@ -224,6 +226,12 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs view = view ) + windowFeature.set( + feature = WindowFeature(requireComponents.core.sessionManager), + owner = this, + view = view + ) + downloadsFeature.set( feature = DownloadsFeature( requireContext().applicationContext, diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index fdabac337..2aac320ef 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -40,7 +40,7 @@ import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.library.LibraryPageFragment import org.mozilla.fenix.share.ShareTab -@SuppressWarnings("TooManyFunctions") +@SuppressWarnings("TooManyFunctions", "LargeClass") class HistoryFragment : LibraryPageFragment(), BackHandler { private lateinit var historyStore: HistoryStore private lateinit var historyView: HistoryView