Merge branch 'dev' of https://github.com/hyb1996/NoRootScriptDroid into dev

# Conflicts:
#	.idea/caches/build_file_checksums.ser

inrt/src/main/assets/project/main.js

@@ -1 +1 @@
-Yﾎ?翔<EFBFBD>Mｺzｫｱ
+toast("Hello, Auto.js");

inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt

@@ -24,7 +24,7 @@ class SettingsActivity : AppCompatActivity() {
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         toolbar.setTitle(R.string.text_settings)
         setSupportActionBar(toolbar)
-        toolbar.setNavigationOnClickListener { v -> finish() }
+        toolbar.setNavigationOnClickListener { finish() }
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 

inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt

@@ -17,22 +17,28 @@ class XJavaScriptEngine(context: Context) : LoopBasedJavaScriptEngine(context) {
     override fun execute(source: ScriptSource, callback: ExecuteCallback?) {
         if (source is JavaScriptFileSource) {
             try {
-                execute(source.file)
+                if (execute(source.file)) {
+                    return
+                }
             } catch (e: Throwable) {
                 e.printStackTrace()
+                return
             }
-        } else {
-            super.execute(source, callback)
         }
+        super.execute(source, callback)
     }
 
-    private fun execute(file: File) {
+    private fun execute(file: File): Boolean {
         val bytes = PFiles.readBytes(file.path)
+        if (!EncryptedScriptFileHeader.isValidFile(bytes)) {
+            return false
+        }
         try {
             super.execute(StringScriptSource(file.name, String(ScriptEncryption.decrypt(bytes, EncryptedScriptFileHeader.BLOCK_SIZE))))
         } catch (e: GeneralSecurityException) {
             e.printStackTrace()
         }
+        return true
     }
 
 }

inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt

@@ -70,7 +70,7 @@ open class AssetsProjectLauncher(private val mAssetsProjectDir: String, private
             val source = JavaScriptFileSource("main", mMainScriptFile)
             val config = ExecutionConfig(workingDirectory = mProjectDir)
             if (source.executionMode and JavaScriptSource.EXECUTION_MODE_UI != 0) {
-                config.intentFlags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NO_HISTORY
+                config.intentFlags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_TASK_ON_HOME
             } else {
                 activity?.finish()
             }