Favorite search >>> back to the result not possible #19242

OsmAnd/src/net/osmand/plus/myplaces/MyPlacesActivity.java

@@ -20,7 +20,7 @@
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TabActivity;
-import net.osmand.plus.backup.ui.BackupAuthorizationFragment;
+import net.osmand.plus.myplaces.favorites.dialogs.FavoritesSearchFragment;
 import net.osmand.plus.myplaces.favorites.dialogs.FavoritesTreeFragment;
 import net.osmand.plus.myplaces.favorites.dialogs.FragmentStateHolder;
 import net.osmand.plus.myplaces.tracks.dialogs.AvailableTracksFragment;
@@ -81,10 +81,17 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 					}
 				}
 				viewPager.setCurrentItem(pagerItem, false);
+				maybeShowFavoritesSearch(intentParams);
 			}
 		}
 	}
 
+	private void maybeShowFavoritesSearch(final Bundle bundle) {
+		FavoritesSearchFragment
+				.getSearchQuery(bundle)
+				.ifPresent(searchQuery -> FavoritesSearchFragment.showInstance(this, searchQuery));
+	}
+
 	public void updateToolbar() {
 		ActionBar actionBar = getSupportActionBar();
 		if (actionBar != null) {

OsmAnd/src/net/osmand/plus/myplaces/favorites/dialogs/FavoritesSearchFragment.java

@@ -56,6 +56,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 public class FavoritesSearchFragment extends DialogFragment {
@@ -115,11 +116,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 				new SimpleTextWatcher() {
 					@Override
 					public void afterTextChanged(Editable s) {
-						String newQueryText = s.toString();
-						if (!searchQuery.equalsIgnoreCase(newQueryText)) {
-							searchQuery = newQueryText;
-							listAdapter.getFilter().filter(newQueryText);
-						}
+						searchQuery = s.toString();
+						listAdapter.getFilter().filter(searchQuery);
 					}
 				}
 		);
@@ -165,6 +163,7 @@ public void onScrollStateChanged(AbsListView view, int scrollState) {
 			listAdapter.setAccessibilityAssistant(accessibilityAssistant);
 			listAdapter.synchronizePoints();
 			listView.setAdapter(listAdapter);
+			searchEditText.setText(searchQuery);
 		}
 		openKeyboard();
 	}
@@ -208,7 +207,17 @@ public void showOnMap(FavouritePoint point) {
 				new PointDescription(PointDescription.POINT_TYPE_FAVORITE, point.getName()),
 				true,
 				point);
-		MapActivity.launchMapActivityMoveToTop(requireActivity());
+        MapActivity.launchMapActivityMoveToTop(requireActivity(), createBundle(searchQuery), null, null);
+	}
+
+	private static Bundle createBundle(final String searchQuery) {
+		final Bundle bundle = new Bundle();
+		bundle.putString(FAV_SEARCH_QUERY_KEY, searchQuery);
+		return bundle;
+	}
+
+	public static Optional<String> getSearchQuery(final Bundle bundle) {
+		return Optional.ofNullable(bundle.getString(FAV_SEARCH_QUERY_KEY));
 	}
 
 	private OsmandApplication getMyApplication() {

OsmAnd/test/java/net/osmand/test/activities/FavoritesSearchTest.java

@@ -0,0 +1,146 @@
+package net.osmand.test.activities;
+
+
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static net.osmand.test.common.Matchers.childAtPosition;
+import static net.osmand.test.common.OsmAndDialogInteractions.skipAppStartDialogs;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.anything;
+import static org.hamcrest.Matchers.is;
+
+import android.view.View;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.espresso.DataInteraction;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+
+import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
+import net.osmand.test.common.AndroidTest;
+import net.osmand.test.common.ResourcesImporter;
+
+import org.hamcrest.Matcher;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+
+import java.io.File;
+import java.io.IOException;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class FavoritesSearchTest extends AndroidTest {
+
+    @Test
+    public void assertIssue19242IsFixed_a_prepare() {
+        try (final ActivityScenario<MapActivity> activityScenario = ActivityScenario.launch(MapActivity.class)) {
+            activityScenario.onActivity(activity -> importFavorite(new File("favorites.gpx"), activity));
+        }
+    }
+
+    // assert that https://github.com/osmandapp/OsmAnd/issues/19242 is fixed
+    @Test
+    public void assertIssue19242IsFixed_b() {
+        // Given
+        final String favorite = "Morgenstelle";
+        ActivityScenario.launch(MapActivity.class);
+        skipAppStartDialogs(app);
+        navigateToFavoritesSearchUI();
+
+        // When
+        onView(searchQueryTextField()).perform(replaceText(favorite), closeSoftKeyboard()); // results in UI state A
+        displayFavoriteOnMap();
+        pressBack();
+        pressBack();
+
+        // Then UI state A is restored
+        onView(searchQueryTextField()).check(matches(withText(favorite)));
+    }
+
+    private static void navigateToFavoritesSearchUI() {
+        onView(mapMenu()).perform(click());
+        myPlaces().perform(click());
+        onView(search()).perform(click());
+    }
+
+    private static Matcher<View> mapMenu() {
+        return allOf(
+                withId(R.id.map_menu_button),
+                withContentDescription(R.string.backToMenu),
+                childAtPosition(
+                        childAtPosition(
+                                withId(R.id.bottom_controls_container),
+                                3),
+                        0),
+                isDisplayed());
+    }
+
+    private static DataInteraction myPlaces() {
+        return onData(anything())
+                .inAdapterView(
+                        allOf(
+                                withId(R.id.menuItems),
+                                childAtPosition(
+                                        withId(R.id.drawer_relative_layout),
+                                        0)))
+                .atPosition(3);
+    }
+
+    private static Matcher<View> search() {
+        return allOf(
+                withContentDescription("Filter"),
+                childAtPosition(
+                        childAtPosition(
+                                withId(me.zhanghai.android.materialprogressbar.R.id.action_bar),
+                                3),
+                        0),
+                isDisplayed());
+    }
+
+    private static Matcher<View> searchQueryTextField() {
+        return allOf(
+                withId(R.id.searchEditText),
+                withParent(
+                        allOf(
+                                withId(R.id.search_container),
+                                withParent(withId(R.id.toolbar)))),
+                isDisplayed());
+    }
+
+    private static void displayFavoriteOnMap() {
+        final DataInteraction favorite =
+                onData(anything())
+                        .inAdapterView(
+                                allOf(
+                                        withId(android.R.id.list),
+                                        childAtPosition(
+                                                withClassName(is("android.widget.LinearLayout")),
+                                                1)))
+                        .atPosition(2);
+        favorite.perform(click());
+    }
+
+    private void importFavorite(final File favoriteAssetFile, final FragmentActivity activity) {
+        try {
+            ResourcesImporter.importFavorite(favoriteAssetFile, app, activity);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

OsmAnd/test/java/net/osmand/test/common/ResourcesImporter.java

@@ -4,6 +4,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import net.osmand.IProgress;
@@ -13,6 +14,7 @@
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.importfiles.ImportHelper;
 import net.osmand.plus.importfiles.SaveImportedGpxListener;
+import net.osmand.plus.importfiles.tasks.FavoritesImportTask;
 import net.osmand.plus.importfiles.tasks.SaveGpxAsyncTask;
 import net.osmand.plus.utils.FileUtils;
 import net.osmand.util.Algorithms;
@@ -77,7 +79,45 @@ public static void importObfAssets(@NonNull OsmandApplication app, @NonNull List
 		}
 	}
 
-	@NonNull
+    public static void importFavorite(final File favoriteAssetFile, final OsmandApplication app, final FragmentActivity activity) throws IOException {
+        executeAndWaitForCompletion(createFavoritesImportTask(favoriteAssetFile, app, activity));
+    }
+
+    private static FavoritesImportTask createFavoritesImportTask(
+            final File favoriteAssetFile,
+            final OsmandApplication app,
+            final FragmentActivity activity) throws IOException {
+        return new FavoritesImportTask(
+                activity,
+                getGpxFile(favoriteAssetFile, app),
+                favoriteAssetFile.getName(),
+                false);
+    }
+
+    private static GPXFile getGpxFile(final File favoriteAssetFile, final OsmandApplication app) throws IOException {
+        final File tmpFavoriteAssetFile = new File(FileUtils.getTempDir(app), System.currentTimeMillis() + "_" + favoriteAssetFile.getName());
+        copy(app, favoriteAssetFile, tmpFavoriteAssetFile);
+        return GPXUtilities.loadGPXFile(tmpFavoriteAssetFile);
+    }
+
+    private static void copy(final OsmandApplication app, final File srcAssetFile, final File dst) throws IOException {
+        try (final InputStream is = InstrumentationRegistry.getInstrumentation().getContext().getAssets().open(srcAssetFile.getName(), AssetManager.ACCESS_STREAMING)) {
+            final boolean success = ImportHelper.copyFile(app, dst, is, true, false) == null;
+            if (!success) {
+                throw new IOException();
+            }
+        }
+    }
+
+    private static void executeAndWaitForCompletion(final FavoritesImportTask favoritesImportTask) {
+        try {
+            favoritesImportTask.execute().get();
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @NonNull
 	private static File getObfDestFile(@NonNull OsmandApplication app, @NonNull String name) {
 		if (name.endsWith(IndexConstants.BINARY_ROAD_MAP_INDEX_EXT)) {
 			return app.getAppPath(IndexConstants.ROADS_INDEX_DIR + name);