Merge pull request #21881 from osmandapp/fix_#21743

Fix #21743
osmandapp · Feb 10, 2025 · c30b4c8 · c30b4c8
2 parents e0f9548 + 654018f
commit c30b4c8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/OsmAnd/src/net/osmand/plus/backup/ui/ChangesTabFragment.java b/OsmAnd/src/net/osmand/plus/backup/ui/ChangesTabFragment.java
@@ -30,6 +30,7 @@
 import net.osmand.plus.backup.SyncBackupTask.OnBackupSyncListener;
 import net.osmand.plus.backup.ui.ChangesFragment.RecentChangesType;
 import net.osmand.plus.base.BaseOsmAndFragment;
+import net.osmand.plus.settings.backend.backup.items.FileSettingsItem;
 import net.osmand.plus.settings.backend.backup.items.SettingsItem;
 
 import java.util.ArrayList;
@@ -151,7 +152,7 @@ public void downloadCloudVersions() {
 	private void updateAdapter() {
 		if (adapter != null) {
 			items = generateData();
-			Collections.sort(items, (o1, o2) -> -Long.compare(o1.time, o2.time));
+			Collections.sort(items, (o1, o2) -> o1.name.compareTo(o2.name));
 			adapter.setCloudChangeItems(items);
 		}
 	}
@@ -178,6 +179,7 @@ static class FileInfo {
 
 	public static class CloudChangeItem {
 
+		public String name;
 		public String title;
 		public String fileName;
 		public String description;
@@ -215,6 +217,14 @@ protected CloudChangeItem createChangeItem(@NonNull SyncOperationType operationT
 			item.remoteFile = remoteFile;
 			item.fileName = BackupUtils.getItemFileName(settingsItem);
 
+			String type;
+			if (settingsItem instanceof FileSettingsItem fileItem) {
+				type = fileItem.getSubtype().name();
+			} else {
+				type = settingsItem.getType().name();
+			}
+			item.name = type + "/" + item.title;
+
 			return item;
 		}
 		return null;