blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No Issue - Fixes nits in #2669

master
Jeff Boek 2019-05-20 22:55:41 -07:00
parent a041d9ef74
commit 1cd50ba9cb
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -75,7 +75,7 @@ class HomeFragment : Fragment(), CoroutineScope {
private var homeMenu: HomeMenu? = null private var homeMenu: HomeMenu? = null
var deleteSessionJob: (suspend () -> Unit)? = null var deleteSessionJob: (suspend () -> Unit)? = null
private var layoutManagerSate: Parcelable? = null private var layoutManagerState: Parcelable? = null
private val onboarding by lazy { FenixOnboarding(requireContext()) } private val onboarding by lazy { FenixOnboarding(requireContext()) }
private lateinit var sessionControlComponent: SessionControlComponent private lateinit var sessionControlComponent: SessionControlComponent
@ -186,23 +186,23 @@ class HomeFragment : Fragment(), CoroutineScope {
} }
override fun onViewStateRestored(savedInstanceState: Bundle?) { override fun onViewStateRestored(savedInstanceState: Bundle?) {
super.onViewStateRestored(savedInstanceState)
savedInstanceState?.apply { savedInstanceState?.apply {
layoutManagerSate = getParcelable(KEY_LAYOUT_MANAGER_STATE) layoutManagerState = getParcelable(KEY_LAYOUT_MANAGER_STATE)
val progress = getFloat(KEY_MOTION_LAYOUT_PROGRESS) val progress = getFloat(KEY_MOTION_LAYOUT_PROGRESS)
homeLayout.progress = if (progress > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f homeLayout.progress = if (progress > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f
} }
super.onViewStateRestored(savedInstanceState)
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
sessionControlComponent.view.layoutManager!!.onSaveInstanceState()!!.apply { sessionControlComponent.view.layoutManager!!.onSaveInstanceState()!!.apply {
outState.putParcelable(KEY_LAYOUT_MANAGER_STATE, this) outState.putParcelable(KEY_LAYOUT_MANAGER_STATE, this)
} }
outState.putFloat(KEY_MOTION_LAYOUT_PROGRESS, homeLayout.progress) outState.putFloat(KEY_MOTION_LAYOUT_PROGRESS, homeLayout.progress)
super.onSaveInstanceState(outState)
} }
override fun onDestroyView() { override fun onDestroyView() {
@ -227,11 +227,11 @@ class HomeFragment : Fragment(), CoroutineScope {
is SessionControlAction.Collection -> handleCollectionAction(it.action) is SessionControlAction.Collection -> handleCollectionAction(it.action)
is SessionControlAction.Onboarding -> handleOnboardingAction(it.action) is SessionControlAction.Onboarding -> handleOnboardingAction(it.action)
is SessionControlAction.ReloadData -> { is SessionControlAction.ReloadData -> {
layoutManagerSate?.also { parcelable -> layoutManagerState?.also { parcelable ->
sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
} }
layoutManagerSate = null layoutManagerState = null
} }
} }
} }

11
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
View File

@ -38,13 +38,10 @@ class OnboardingTrackingProtectionViewHolder(val view: View) : RecyclerView.View
private fun updateTrackingProtectionSetting(enabled: Boolean) { private fun updateTrackingProtectionSetting(enabled: Boolean) {
Settings.getInstance(view.context).setTrackingProtection(enabled) Settings.getInstance(view.context).setTrackingProtection(enabled)
with(view.context.components.core) { with(view.context.components) {
val policy = createTrackingProtectionPolicy(enabled) val policy = core.createTrackingProtectionPolicy(enabled)
engine.settings.trackingProtectionPolicy = policy useCases.settingsUseCases.updateTrackingProtection.invoke(policy)
sessionManager.sessions.forEach { useCases.sessionUseCases.reload.invoke()
if (enabled) sessionManager.getEngineSession(it)?.enableTrackingProtection(policy)
else sessionManager.getEngineSession(it)?.disableTrackingProtection()
}
} }
view.context.components.useCases.sessionUseCases.reload.invoke() view.context.components.useCases.sessionUseCases.reload.invoke()