From 84b0693fd25635133434ae345bb351ca58044367 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Thu, 22 Aug 2019 14:35:51 -0400 Subject: [PATCH] For #4652 : Use workaround for HomeScreenViewModel (#4887) --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 6cc941a78..9b85ff403 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -190,7 +190,9 @@ class HomeFragment : Fragment(), AccountObserver { super.onViewCreated(view, savedInstanceState) FragmentPreDrawManager(this).execute { - val homeViewModel: HomeScreenViewModel by activityViewModels() + val homeViewModel: HomeScreenViewModel by activityViewModels { + ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652 + } homeViewModel.layoutManagerState?.also { parcelable -> sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) } @@ -514,7 +516,9 @@ class HomeFragment : Fragment(), AccountObserver { override fun onPause() { invokePendingDeleteJobs() super.onPause() - val homeViewModel: HomeScreenViewModel by activityViewModels() + val homeViewModel: HomeScreenViewModel by activityViewModels { + ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652 + } homeViewModel.layoutManagerState = sessionControlComponent.view.layoutManager?.onSaveInstanceState() homeViewModel.motionLayoutProgress = homeLayout?.progress ?: 0F