From ca3242ee5836edacd9050b284187a202ec31bf44 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Tue, 12 Apr 2022 20:36:56 -0400 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/24747 - Remove unused store property in SessionControlAdapter and SessionControlView --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 1 - .../mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt | 2 -- .../mozilla/fenix/home/sessioncontrol/SessionControlView.kt | 3 --- .../fenix/home/sessioncontrol/SessionControlViewTest.kt | 2 -- 4 files changed, 8 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index b2af6f5e2e..3fd2a10106 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -391,7 +391,6 @@ class HomeFragment : Fragment() { updateLayout(binding.root) sessionControlView = SessionControlView( - components.appStore, binding.sessionControlRecyclerView, viewLifecycleOwner, sessionControlInteractor diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt index f8ca42f26c..cb881458c4 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt @@ -16,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.top.sites.TopSite import mozilla.components.ui.widgets.WidgetSiteItemView -import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.Components import org.mozilla.fenix.gleanplumb.Message import org.mozilla.fenix.home.BottomSpacerViewHolder @@ -204,7 +203,6 @@ class AdapterItemDiffCallback : DiffUtil.ItemCallback() { @Suppress("LongParameterList") class SessionControlAdapter( - private val store: AppStore, private val interactor: SessionControlInteractor, private val viewLifecycleOwner: LifecycleOwner, private val components: Components diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt index 89a70bf548..fc7c6d9d83 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt @@ -13,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.top.sites.TopSite import mozilla.components.service.pocket.PocketRecommendedStory -import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.appstate.AppState import org.mozilla.fenix.gleanplumb.Message import org.mozilla.fenix.ext.components @@ -180,7 +179,6 @@ private fun collectionTabItems(collection: TabCollection) = } class SessionControlView( - store: AppStore, val containerView: View, viewLifecycleOwner: LifecycleOwner, internal val interactor: SessionControlInteractor @@ -189,7 +187,6 @@ class SessionControlView( val view: RecyclerView = containerView as RecyclerView private val sessionControlAdapter = SessionControlAdapter( - store, interactor, viewLifecycleOwner, containerView.context.components diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt index 9125aa09e4..62da50c051 100644 --- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/SessionControlViewTest.kt @@ -95,7 +95,6 @@ class SessionControlViewTest { val interactor = mockk(relaxed = true) val view = RecyclerView(testContext) val controller = SessionControlView( - mockk(relaxed = true), view, mockk(relaxed = true), interactor @@ -117,7 +116,6 @@ class SessionControlViewTest { val interactor = mockk(relaxed = true) val view = RecyclerView(testContext) val controller = SessionControlView( - mockk(relaxed = true), view, mockk(relaxed = true), interactor