Small bugfix for tabsSortModes cleanup

osmandapp · May 15, 2024 · a226f58 · a226f58
1 parent adffeaa
commit a226f58
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/BaseTrackFolderFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/tracks/dialogs/BaseTrackFolderFragment.java
@@ -35,6 +35,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import net.osmand.IndexConstants;
 import net.osmand.data.LatLon;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -351,7 +352,6 @@ protected String getSortEntryName() {
 	@Override
 	public void setTracksSortMode(@NonNull TracksSortMode sortMode, boolean sortSubFolders) {
 		if (sortSubFolders) {
-			removeSurplusTabsSortModes();
 			sortSubFolder(sortMode);
 		} else {
 			Map<String, String> tabsSortModes = settings.getTrackSortModes();
@@ -382,8 +382,10 @@ private void sortFolders(TrackFolder trackFolder, Map<String, String> tabsSortMo
 	}
 
 	private void removeSurplusTabsSortModes() {
-	// TODO: Find adequate places to call this from
-	// Call only from tracks root folder to not lose valid entries!
+		if (!rootFolder.getDirFile().equals(app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
+			// Execute only from tracks root folder to not lose valid entries
+			return;
+		}
 		OsmandSettings settings = app.getSettings();
 		Map<String, String> oldTabsSortModes = settings.getTrackSortModes();
 		Map<String, String> tabsSortModes = new HashMap<>();
@@ -508,11 +510,13 @@ public ScreenPositionData getFirstSuitableItemScreenPosition() {
 	@Override
 	public void onFolderRenamed(@NonNull File newDir) {
 		updateContent();
+		removeSurplusTabsSortModes();
 	}
 
 	@Override
 	public void onFolderDeleted() {
 		reloadTracks();
+		removeSurplusTabsSortModes();
 	}
 
 	@Override