Merge pull request #17761 from osmandapp/fix_17672

Fix #17672
osmandapp · Jul 30, 2023 · 35c1862 · 35c1862
2 parents e9c36c3 + 8f7e853
commit 35c1862
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/MyPlacesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/MyPlacesActivity.java
@@ -1,6 +1,5 @@
 package net.osmand.plus.myplaces;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -12,23 +11,19 @@
 import androidx.viewpager.widget.ViewPager;
 import androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener;
 
-import net.osmand.PlatformUtil;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandApplication;
 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.importfiles.ImportHelper;
 import net.osmand.plus.myplaces.favorites.dialogs.FavoritesTreeFragment;
 import net.osmand.plus.myplaces.favorites.dialogs.FragmentStateHolder;
 import net.osmand.plus.myplaces.tracks.dialogs.AvailableTracksFragment;
 import net.osmand.plus.plugins.PluginsHelper;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 
-import org.apache.commons.logging.Log;
-
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,18 +33,13 @@
  */
 public class MyPlacesActivity extends TabActivity {
 
-	private static final Log LOG = PlatformUtil.getLog(MyPlacesActivity.class);
-
-	public static final int OPEN_GPX_DOCUMENT_REQUEST = 1006;
-	public static final int IMPORT_FAVOURITES_REQUEST = 1007;
 
 	public static final String TAB_ID = "selected_tab_id";
 
 	public static final int GPX_TAB = R.string.shared_string_tracks;
 	public static final int FAV_TAB = R.string.shared_string_my_favorites;
 
 	private OsmandSettings settings;
-	private ImportHelper importHelper;
 
 	private ViewPager viewPager;
 	private List<WeakReference<FragmentStateHolder>> fragmentsStateList = new ArrayList<>();
@@ -61,7 +51,6 @@ public class MyPlacesActivity extends TabActivity {
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		OsmandApplication app = getMyApplication();
 		settings = app.getSettings();
-		importHelper = new ImportHelper(this);
 		app.applyTheme(this);
 		super.onCreate(savedInstanceState);
 
@@ -95,17 +84,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		}
 	}
 
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) {
-			if (data != null && data.getData() != null) {
-				importHelper.handleFavouritesImport(data.getData());
-			}
-		} else {
-			super.onActivityResult(requestCode, resultCode, data);
-		}
-	}
-
 	private void setTabs(@NonNull List<TabItem> tabItems) {
 		PagerSlidingTabStrip mSlidingTabLayout = findViewById(R.id.sliding_tabs);
 		Integer tabId = settings.FAVORITES_TAB.get();

diff --git a/OsmAnd/src/net/osmand/plus/myplaces/favorites/dialogs/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/favorites/dialogs/FavoritesTreeFragment.java
@@ -4,10 +4,9 @@
 import static net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
 import static net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
 import static net.osmand.plus.myplaces.MyPlacesActivity.FAV_TAB;
-import static net.osmand.plus.myplaces.MyPlacesActivity.IMPORT_FAVOURITES_REQUEST;
 import static net.osmand.plus.myplaces.MyPlacesActivity.TAB_ID;
-import static net.osmand.plus.widgets.dialogbutton.DialogButtonType.SECONDARY;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.Typeface;
@@ -81,17 +80,19 @@
 public class FavoritesTreeFragment extends OsmandExpandableListFragment implements FragmentStateHolder,
 		OsmAndCompassListener, OsmAndLocationListener, ShareFavoritesListener {
 
-	public static final int SEARCH_ID = -1;
-	public static final int DELETE_ID = 2;
-	public static final int DELETE_ACTION_ID = 3;
-	public static final int SHARE_ID = 4;
-	public static final int SELECT_MAP_MARKERS_ID = 5;
-	public static final int SELECT_MAP_MARKERS_ACTION_MODE_ID = 6;
-	public static final int IMPORT_FAVOURITES_ID = 7;
-	public static final String GROUP_EXPANDED_POSTFIX = "_group_expanded";
+	private static final int IMPORT_FAVOURITES_REQUEST = 1007;
+	private static final int SEARCH_ID = -1;
+	private static final int DELETE_ID = 2;
+	private static final int DELETE_ACTION_ID = 3;
+	private static final int SHARE_ID = 4;
+	private static final int SELECT_MAP_MARKERS_ID = 5;
+	private static final int SELECT_MAP_MARKERS_ACTION_MODE_ID = 6;
+	private static final int IMPORT_FAVOURITES_ID = 7;
+	private static final String GROUP_EXPANDED_POSTFIX = "_group_expanded";
 
 	private FavouritesHelper helper;
 	private FavouritesAdapter favouritesAdapter;
+	private ImportHelper importHelper;
 
 	private boolean selectionMode;
 	private final LinkedHashMap<String, Set<FavouritePoint>> favoritesSelected = new LinkedHashMap<>();
@@ -119,6 +120,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		favouritesAdapter = new FavouritesAdapter();
+		importHelper = new ImportHelper(requireActivity());
 
 		helper = app.getFavoritesHelper();
 		if (helper.isFavoritesLoaded()) {
@@ -179,10 +181,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 			boolean nightMode = !app.getSettings().isLightContent();
 			View searchView = inflater.inflate(R.layout.search_fav_list_item, listView, false);
 			searchView.setBackgroundResource(ColorUtilities.getListBgColorId(nightMode));
+
 			TextView title = searchView.findViewById(R.id.title);
-			Drawable searchIcon = app.getUIUtilities().getThemedIcon(R.drawable.ic_action_search_dark);
+			Drawable searchIcon = getContentIcon(R.drawable.ic_action_search_dark);
 			AndroidUtils.setCompoundDrawablesWithIntrinsicBounds(title, searchIcon, null, null, null);
-			searchView.setOnClickListener(v -> FavoritesSearchFragment.showInstance(getActivity(), ""));
+			searchView.setOnClickListener(v -> FavoritesSearchFragment.showInstance(requireActivity(), ""));
 			listView.addHeaderView(searchView);
 			View dividerView = inflater.inflate(R.layout.list_item_divider, null, false);
 			boolean proAvailable = InAppPurchaseHelper.isOsmAndProAvailable(app);
@@ -594,6 +597,17 @@ private void importFavourites() {
 		AndroidUtils.startActivityForResultIfSafe(this, intent, IMPORT_FAVOURITES_REQUEST);
 	}
 
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+		if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) {
+			if (data != null && data.getData() != null) {
+				importHelper.handleFavouritesImport(data.getData());
+			}
+		} else {
+			super.onActivityResult(requestCode, resultCode, data);
+		}
+	}
+
 	public void shareFavorites(@Nullable FavoriteGroup group) {
 		ShareFavoritesAsyncTask shareFavoritesTask = new ShareFavoritesAsyncTask(app, group, this);
 		shareFavoritesTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);