diff --git a/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java b/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java index 89c40a4d..45a28613 100644 --- a/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java +++ b/app/src/main/java/com/stardust/scriptdroid/model/script/Scripts.java @@ -100,7 +100,8 @@ public class Scripts { public static ScriptExecution run(ScriptSource source) { return AutoJs.getInstance().getScriptEngineService().execute(source, new ExecutionConfig() - .executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH)); + .executePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH) + .requirePath(StorageFileProvider.DEFAULT_DIRECTORY_PATH)); } public static ScriptExecution runWithBroadcastSender(File file) { diff --git a/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java b/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java index 101d0b74..890d9747 100644 --- a/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java +++ b/app/src/main/java/com/stardust/scriptdroid/pluginclient/DevPluginResponseHandler.java @@ -71,7 +71,7 @@ public class DevPluginResponseHandler implements Handler { } else { name = PFiles.getNameWithoutExtension(name); } - mScriptExecutions.put(viewId, Scripts.run(new StringScriptSource(":" + name, script))); + mScriptExecutions.put(viewId, Scripts.run(new StringScriptSource("[remote]" + name, script))); } private void stopScript(String viewId) { @@ -96,9 +96,7 @@ public class DevPluginResponseHandler implements Handler { } name = PFiles.getNameWithoutExtension(name); if (!name.endsWith(".js")) { - name = "" + name + ".js"; - } else { - name = "" + name; + name = name + ".js"; } PFiles.write(StorageFileProvider.DEFAULT_DIRECTORY_PATH + name, script); GlobalAppContext.toast(R.string.text_script_save_successfully); diff --git a/common/src/main/java/com/stardust/pio/PFiles.java b/common/src/main/java/com/stardust/pio/PFiles.java index ca2ec4cb..9ad1a4d0 100644 --- a/common/src/main/java/com/stardust/pio/PFiles.java +++ b/common/src/main/java/com/stardust/pio/PFiles.java @@ -349,6 +349,7 @@ public class PFiles { } public static String getName(String filePath) { + filePath = filePath.replace('\\', '/'); return new File(filePath).getName(); }