From 71b107f0ffa57e3422ca4d231ecaad130c558582 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Wed, 6 Feb 2019 07:58:28 -0800
Subject: [PATCH] Fixes #384 - Prvent fragment from subscribing multiple times

---
 .../mozilla/fenix/browser/BrowserFragment.kt    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 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 8c35126d2..f01063149 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -8,7 +8,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.transition.TransitionInflater
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -82,13 +81,18 @@ class BrowserFragment : Fragment(), BackHandler {
         return view
     }
 
+    @SuppressLint("CheckResult")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
+        getSafeManagedObservable<SearchAction>()
+            .subscribe {
+                if (it is SearchAction.ToolbarTapped) {
+                    navigateToSearch()
+                }
+            }
     }
 
-    @SuppressLint("CheckResult")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -148,13 +152,6 @@ class BrowserFragment : Fragment(), BackHandler {
             (toolbarComponent.uiView as ToolbarUIView).toolbarIntegration,
             customTabsToolbarFeature
         )
-
-        getSafeManagedObservable<SearchAction>()
-            .subscribe {
-                if (it is SearchAction.ToolbarTapped) {
-                    navigateToSearch()
-                }
-            }
     }
 
     override fun onDestroyView() {