fix wait for restore finished before ExtrasUtil.checkCreateMeta

mg4gh · Jan 26, 2025 · a2a4fe8 · a2a4fe8
1 parent a413a45
commit a2a4fe8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mgmap/src/main/java/mg/mgmap/application/MGMapApplication.java b/mgmap/src/main/java/mg/mgmap/application/MGMapApplication.java
@@ -319,8 +319,9 @@ public void onActivityResumed(@NonNull Activity activity) {
     }
 
     public void checkCreateLoadMetaData(boolean onlyNew){
-        File restoreJob = new File(persistenceManager.getRestoreDir(), "restore.job");
-        while (restoreJob.exists()){ // don't start as restore may add files
+        File backupLatest = new File(persistenceManager.getRestoreDir(), BackupUtil.getBackupFileName(true));
+        File backupFull = new File(persistenceManager.getRestoreDir(), BackupUtil.getBackupFileName(false));
+        while (backupLatest.exists() || backupFull.exists()){ // don't start as restore may add files
             SystemClock.sleep(1000);
         }
         ArrayList<String> newNames = ExtrasUtil.checkCreateMeta(this, this.currentRun);

diff --git a/mgmap/src/main/java/mg/mgmap/generic/util/BackupUtil.java b/mgmap/src/main/java/mg/mgmap/generic/util/BackupUtil.java
@@ -38,7 +38,7 @@ public class BackupUtil {
 
     private static final AtomicBoolean inProgress = new AtomicBoolean(false);
 
-    private static String getBackupFileName(boolean latest){
+    public static String getBackupFileName(boolean latest){
         return "backup_"+(latest?"latest":"full")+".zip";
     }