Merge pull request #743 from NativeScript/pete/delete-temp-sync-dir

Force delete temporary livesync dir after syncing .xml or .css files

Author: petekanev

build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptSyncService.java

@@ -128,7 +128,11 @@ public void run() {
                 int length = input.readInt();
                 input.readFully(new byte[length]); // ignore the payload
                 executePartialSync(context, syncDir);
+                // delete temporary /sync dir after syncing .xml/.css resources
+                deleteRecursive(syncDir);
                 executeRemovedSync(context, removedSyncDir);
+                // delete temporary /removedsync dir after removing files from the project
+                deleteRecursive(removedSyncDir);
 
                 runtime.runScript(new File(NativeScriptSyncService.this.context.getFilesDir(), "internal/livesync.js"));
                 try {
@@ -157,7 +161,11 @@ private void deleteRecursive(File fileOrDirectory) {
             }
         }
 
-        fileOrDirectory.delete();
+        boolean success = fileOrDirectory.delete();
+
+        if (!success && fileOrDirectory.isDirectory()) {
+            android.util.Log.d("Sync", "Failed to delete temp sync directory: " + fileOrDirectory.getAbsolutePath());
+        }
     }
 
     public static boolean isSyncEnabled(Context context) {

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

@@ -128,7 +128,11 @@ public void run() {
                 int length = input.readInt();
                 input.readFully(new byte[length]); // ignore the payload
                 executePartialSync(context, syncDir);
+                // delete temporary /sync dir after syncing .xml/.css resources
+                deleteRecursive(syncDir);
                 executeRemovedSync(context, removedSyncDir);
+                // delete temporary /removedsync dir after removing files from the project
+                deleteRecursive(removedSyncDir);
 
                 runtime.runScript(new File(NativeScriptSyncService.this.context.getFilesDir(), "internal/livesync.js"));
                 try {
@@ -157,7 +161,11 @@ private void deleteRecursive(File fileOrDirectory) {
             }
         }
 
-        fileOrDirectory.delete();
+        boolean success = fileOrDirectory.delete();
+
+        if (!success && fileOrDirectory.isDirectory()) {
+            android.util.Log.d("Sync", "Failed to delete temp sync directory: " + fileOrDirectory.getAbsolutePath());
+        }
     }
 
     public static boolean isSyncEnabled(Context context) {