From 98879452967bafed1e9b2b599c65631de5b95899 Mon Sep 17 00:00:00 2001
From: Christian Sadilek <christian.sadilek@gmail.com>
Date: Thu, 1 Aug 2019 11:10:13 -0400
Subject: [PATCH] For #4412: Only consume state change when UI initialized

---
 .../mozilla/fenix/browser/BrowserFragment.kt  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 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 17162bb0b..ef7362272 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -227,6 +227,27 @@ class BrowserFragment : Fragment(), BackHandler {
             browserToolbarView.view.setOnSiteSecurityClickedListener {
                 showQuickSettingsDialog()
             }
+
+            customTabSessionId?.let { customTabSessionId ->
+                customTabsIntegration.set(
+                    feature = CustomTabsIntegration(
+                        requireContext(),
+                        requireComponents.core.sessionManager,
+                        toolbar,
+                        customTabSessionId,
+                        activity,
+                        view.nestedScrollQuickAction,
+                        view.swipeRefresh,
+                        onItemTapped = { browserInteractor.onBrowserToolbarMenuItemTapped(it) }
+                    ),
+                    owner = this,
+                    view = view)
+            }
+
+            consumeFrom(browserStore) {
+                quickActionSheetView.update(it)
+                browserToolbarView.update(it)
+            }
         }
 
         contextMenuFeature.set(
@@ -404,27 +425,6 @@ class BrowserFragment : Fragment(), BackHandler {
             owner = this,
             view = view
         )
-
-        customTabSessionId?.let {
-            customTabsIntegration.set(
-                feature = CustomTabsIntegration(
-                    requireContext(),
-                    requireComponents.core.sessionManager,
-                    toolbar,
-                    it,
-                    activity,
-                    view.nestedScrollQuickAction,
-                    view.swipeRefresh,
-                    onItemTapped = { browserInteractor.onBrowserToolbarMenuItemTapped(it) }
-                ),
-                owner = this,
-                view = view)
-        }
-
-        consumeFrom(browserStore) {
-            quickActionSheetView.update(it)
-            browserToolbarView.update(it)
-        }
     }
 
     private fun themeReaderViewControlsForPrivateMode(view: View) = with(view) {