Fix GpxDataItem update after file rename

osmandapp · Jul 26, 2023 · 72855dc · 72855dc
1 parent d2f0afe
commit 72855dc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/OsmAnd/src/net/osmand/plus/track/helpers/GpxDbHelper.java b/OsmAnd/src/net/osmand/plus/track/helpers/GpxDbHelper.java
@@ -80,13 +80,18 @@ private GpxDataItem putToCache(@NonNull GpxDataItem item) {
 		return itemsCache.put(item.getFile(), item);
 	}
 
-	private void removeFromCache(@NonNull GpxDataItem item) {
-		itemsCache.remove(item.getFile());
+	private void removeFromCache(@NonNull File file) {
+		itemsCache.remove(file);
 	}
 
 	public boolean rename(@NonNull File currentFile, @NonNull File newFile) {
 		GpxDataItem item = itemsCache.get(currentFile);
-		return database.rename(item, currentFile, newFile);
+		boolean res = database.rename(item, currentFile, newFile);
+		if (item != null) {
+			putToCache(item);
+			removeFromCache(currentFile);
+		}
+		return res;
 	}
 
 	public boolean updateColor(@NonNull GpxDataItem item, int color) {