From a320e9568b1a32b707ec60c0cdcc1e6eae092538 Mon Sep 17 00:00:00 2001
From: Christian Sadilek <christian.sadilek@gmail.com>
Date: Wed, 31 Jul 2019 12:14:05 -0400
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/4412: BrowserInteractor has
 not been initialized (https://github.com/mozilla-mobile/fenix/pull/4414)

---
 .../org/mozilla/fenix/browser/BrowserFragment.kt     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index f21979d6c7..abd7796dfe 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -168,11 +168,11 @@ class BrowserFragment : Fragment(), BackHandler {
 
         val sessionManager = requireComponents.core.sessionManager
 
-        val viewModel = activity!!.run {
-            ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
-        }
-
         getSessionById()?.let { session ->
+            val viewModel = activity!!.run {
+                ViewModelProviders.of(this).get(CreateCollectionViewModel::class.java)
+            }
+
             browserInteractor = BrowserInteractor(
                 context = context!!,
                 store = browserStore,
@@ -221,9 +221,9 @@ class BrowserFragment : Fragment(), BackHandler {
                 owner = this,
                 view = view
             )
-        }
 
-        quickActionSheetView = QuickActionSheetView(view.nestedScrollQuickAction, browserInteractor)
+            quickActionSheetView = QuickActionSheetView(view.nestedScrollQuickAction, browserInteractor)
+        }
 
         browserToolbarView.view.setOnSiteSecurityClickedListener {
             showQuickSettingsDialog()