From c9c43260c945c6d2398d49af884fbaa03ffef5ce Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Thu, 8 Aug 2019 17:40:55 -0500
Subject: [PATCH] For #4529: Handle crash initializing
 CreateCollectionViewModel late (#4628)

---
 .../main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 3 ++-
 1 file changed, 2 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 c205833f6..7c5446cd2 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -101,6 +101,8 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
     private var browserInitialized: Boolean = false
     private var initUIJob: Job? = null
 
+    val viewModel: CreateCollectionViewModel by activityViewModels()
+
     @CallSuper
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -145,7 +147,6 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
         val sessionManager = requireComponents.core.sessionManager
 
         return getSessionById()?.also { session ->
-            val viewModel: CreateCollectionViewModel by activityViewModels()
 
             val browserToolbarController = DefaultBrowserToolbarController(
                 context!!,