From eff622a96238183edee26cd791bd2510a45b2bc4 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Tue, 8 Nov 2022 14:33:23 +0100 Subject: [PATCH] [android] fix distance not shown on search results Signed-off-by: Arnaud Vergnet --- android/src/app/organicmaps/MwmActivity.java | 3 +-- android/src/app/organicmaps/search/SearchFragment.java | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java index 21e8795f5b..388b53f5c8 100644 --- a/android/src/app/organicmaps/MwmActivity.java +++ b/android/src/app/organicmaps/MwmActivity.java @@ -288,10 +288,9 @@ public class MwmActivity extends BaseMwmFragmentActivity public void showSearch(String query) { + closeSearchToolbar(false, true); if (mIsTabletLayout) { - closeSearchToolbar(false, false); - final Bundle args = new Bundle(); args.putString(SearchActivity.EXTRA_QUERY, query); replaceFragment(SearchFragment.class, args, null); diff --git a/android/src/app/organicmaps/search/SearchFragment.java b/android/src/app/organicmaps/search/SearchFragment.java index beb1e72d0b..20d39f1a92 100644 --- a/android/src/app/organicmaps/search/SearchFragment.java +++ b/android/src/app/organicmaps/search/SearchFragment.java @@ -285,9 +285,6 @@ public class SearchFragment extends BaseMwmFragment updateFrames(); updateResultsPlaceholder(); - if (mInitialQuery != null) - setQuery(mInitialQuery, false); - mToolbarController.activate(); SearchEngine.INSTANCE.addListener(this); @@ -312,6 +309,10 @@ public class SearchFragment extends BaseMwmFragment { super.onResume(); LocationHelper.INSTANCE.addListener(mLocationListener); + if (mInitialQuery != null) { + setQuery(mInitialQuery, false); + mInitialQuery = null; + } } @Override