Merge pull request #1138 from NativeScript/trifonov/improve-livesync-wait

improve livesync wait

Author: vtrifonov

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -194,16 +194,7 @@ public static Runtime initRuntime(Application app) {
                     // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
                     initLiveSync(runtime, logger, app);
 
-                    // CLI will create this file when initial sync is needed and then will remove it after syncing the fails and restarting the app
-                    File liveSyncFile = new File("/data/local/tmp/" + app.getPackageName() + "-livesync-in-progress");
-                    if(liveSyncFile.exists()) {
-                        try {
-                            // wait for the livesync to complete
-                            Thread.sleep(30000);
-                        } catch (Exception ex) {
-
-                        }
-                    }
+                    waitForLiveSync(app);
                 }
 
                 runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
@@ -239,6 +230,32 @@ public static Runtime initRuntime(Application app) {
         }
     }
 
+    private static void waitForLiveSync(Application app) {
+        boolean needToWait = false;
+
+        // CLI will create this file when initial sync is needed and then will remove it after syncing the fails and restarting the app
+        File liveSyncFile = new File("/data/local/tmp/" + app.getPackageName() + "-livesync-in-progress");
+        if(liveSyncFile.exists()) {
+            needToWait = true;
+            Long lastModified = liveSyncFile.lastModified();
+            // we check for lastModified == 0 as this might happen if we cannot get the actual modified date
+            if(lastModified > 0) {
+                Long fileCreatedBeforeMillis = System.currentTimeMillis() - lastModified;
+                // if last modified date is more than a minute before the current time discard the file as most probably this is a leftover
+                if (fileCreatedBeforeMillis > 60000) {
+                    needToWait = false;
+                }
+            }
+        }
+
+        if(needToWait) {
+            try {
+                // wait for the livesync to complete and it should restart the app after deleting the livesync-in-progress file
+                Thread.sleep(30000);
+            } catch (Exception ex) { }
+        }
+    }
+
     private static void registerTimezoneChangedListener(Context context, final Runtime runtime) {
         IntentFilter timezoneFilter = new IntentFilter(Intent.ACTION_TIMEZONE_CHANGED);