From 0f54f2c6e02e2221f0a16f4bfbee70c6c270e961 Mon Sep 17 00:00:00 2001
From: Thomas Kuehne <thomas.kuehne@gmx.li>
Date: Tue, 26 Aug 2025 00:00:00 +0200
Subject: [PATCH] zip backup: sort the external files by name to improve
 comparability

---
 .../gadgetbridge/util/backup/ZipBackupExportJob.java           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/backup/ZipBackupExportJob.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/backup/ZipBackupExportJob.java
index ecb7675988..b7a2bf8047 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/backup/ZipBackupExportJob.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/backup/ZipBackupExportJob.java
@@ -30,6 +30,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -175,6 +176,7 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
             return ret;
         }
 
+        Arrays.sort(childEntries);
         for (final String child : childEntries) {
             getAllRelativeFilesAux(ret, dir, child);
         }
@@ -193,6 +195,7 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
                 return;
             }
 
+            Arrays.sort(childEntries);
             for (final String child : childEntries) {
                 getAllRelativeFilesAux(currentList, externalFilesDir, relativePath + "/" + child);
             }