From ac74dc78a5f26a276d50cfa6493a27d819c54749 Mon Sep 17 00:00:00 2001 From: Peter Kanev Date: Wed, 12 Apr 2017 11:50:31 +0300 Subject: [PATCH] force delete temporary livesync dir after syncing .xml or .css files --- .../src/main/java/com/tns/NativeScriptSyncService.java | 10 +++++++++- .../src/main/java/com/tns/NativeScriptSyncService.java | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptSyncService.java b/build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptSyncService.java index 3f6b115d3..200664f67 100644 --- a/build-artifacts/project-template-gradle/src/main/java/com/tns/NativeScriptSyncService.java +++ b/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) { diff --git a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java b/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java index 3f6b115d3..200664f67 100644 --- a/test-app/app/src/main/java/com/tns/NativeScriptSyncService.java +++ b/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) {