From 797d1cc4237c26c7178a09c41344fc8df167f253 Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Wed, 20 Feb 2019 08:58:42 -0800 Subject: [PATCH] Fixes #566: Clears search on new tab --- .../mozilla/fenix/components/toolbar/ToolbarUIView.kt | 1 + .../main/java/org/mozilla/fenix/search/SearchFragment.kt | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt index 97bb03108..5ec750606 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt @@ -87,6 +87,7 @@ class ToolbarUIView( override fun updateView() = Consumer { if (it.isEditing) { + view.url = it.query view.editMode() } else { view.displayMode() diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index e5c8f892b..afac49aa7 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -18,6 +18,7 @@ import org.mozilla.fenix.components.toolbar.SearchAction import org.mozilla.fenix.components.toolbar.SearchState import org.mozilla.fenix.components.toolbar.ToolbarComponent import org.mozilla.fenix.components.toolbar.ToolbarUIView +import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.getAutoDisposeObservable import org.mozilla.fenix.mvi.getManagedEmitter @@ -38,12 +39,18 @@ class SearchFragment : Fragment() { val sessionId = SearchFragmentArgs.fromBundle(arguments!!).sessionId val isPrivate = SearchFragmentArgs.fromBundle(arguments!!).isPrivateTab val view = inflater.inflate(R.layout.fragment_search, container, false) + val url = sessionId?.let { + requireComponents.core.sessionManager.findSessionById(it)?.let { + session -> session.url + } + } ?: "" + toolbarComponent = ToolbarComponent( view.toolbar_wrapper, ActionBusFactory.get(this), sessionId, isPrivate, - SearchState("", isEditing = true) + SearchState(url, isEditing = true) ) awesomeBarComponent = AwesomeBarComponent( view.search_layout, ActionBusFactory.get(this),