From 1cd50ba9cb0b32ed483d91ba539b830d562a67cc Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Mon, 20 May 2019 22:55:41 -0700 Subject: [PATCH] No Issue - Fixes nits in #2669 --- .../java/org/mozilla/fenix/home/HomeFragment.kt | 16 ++++++++-------- .../OnboardingTrackingProtectionViewHolder.kt | 11 ++++------- 2 files changed, 12 insertions(+), 15 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 c2d16ac24..a15b3ed89 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -75,7 +75,7 @@ class HomeFragment : Fragment(), CoroutineScope { private var homeMenu: HomeMenu? = null var deleteSessionJob: (suspend () -> Unit)? = null - private var layoutManagerSate: Parcelable? = null + private var layoutManagerState: Parcelable? = null private val onboarding by lazy { FenixOnboarding(requireContext()) } private lateinit var sessionControlComponent: SessionControlComponent @@ -186,23 +186,23 @@ class HomeFragment : Fragment(), CoroutineScope { } override fun onViewStateRestored(savedInstanceState: Bundle?) { + super.onViewStateRestored(savedInstanceState) + savedInstanceState?.apply { - layoutManagerSate = getParcelable(KEY_LAYOUT_MANAGER_STATE) + layoutManagerState = getParcelable(KEY_LAYOUT_MANAGER_STATE) val progress = getFloat(KEY_MOTION_LAYOUT_PROGRESS) homeLayout.progress = if (progress > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f } - - super.onViewStateRestored(savedInstanceState) } override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + sessionControlComponent.view.layoutManager!!.onSaveInstanceState()!!.apply { outState.putParcelable(KEY_LAYOUT_MANAGER_STATE, this) } outState.putFloat(KEY_MOTION_LAYOUT_PROGRESS, homeLayout.progress) - - super.onSaveInstanceState(outState) } override fun onDestroyView() { @@ -227,11 +227,11 @@ class HomeFragment : Fragment(), CoroutineScope { is SessionControlAction.Collection -> handleCollectionAction(it.action) is SessionControlAction.Onboarding -> handleOnboardingAction(it.action) is SessionControlAction.ReloadData -> { - layoutManagerSate?.also { parcelable -> + layoutManagerState?.also { parcelable -> sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) } - layoutManagerSate = null + layoutManagerState = null } } } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt index 4534f024a..3e2092949 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt @@ -38,13 +38,10 @@ class OnboardingTrackingProtectionViewHolder(val view: View) : RecyclerView.View private fun updateTrackingProtectionSetting(enabled: Boolean) { Settings.getInstance(view.context).setTrackingProtection(enabled) - with(view.context.components.core) { - val policy = createTrackingProtectionPolicy(enabled) - engine.settings.trackingProtectionPolicy = policy - sessionManager.sessions.forEach { - if (enabled) sessionManager.getEngineSession(it)?.enableTrackingProtection(policy) - else sessionManager.getEngineSession(it)?.disableTrackingProtection() - } + with(view.context.components) { + val policy = core.createTrackingProtectionPolicy(enabled) + useCases.settingsUseCases.updateTrackingProtection.invoke(policy) + useCases.sessionUseCases.reload.invoke() } view.context.components.useCases.sessionUseCases.reload.invoke()