6.6.3 - Alpha5 - 修复 engines.all 方法可能触发 ConcurrentModificationException 的问题 (issue #394)

app/src/main/java/org/autojs/autojs/engine/ScriptEngineManager.java

@@ -9,8 +9,10 @@ import org.autojs.autojs.execution.ScriptExecution;
 import org.autojs.autojs.script.ScriptSource;
 import org.autojs.autojs.tool.Supplier;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -52,7 +54,9 @@ public class ScriptEngineManager {
     }
 
     public Set<ScriptEngine<? extends ScriptSource>> getEngines() {
-        return mEngines;
+        synchronized (mEngines) {
+            return Collections.unmodifiableSet(new LinkedHashSet<>(mEngines));
+        }
     }
 
     public android.content.Context getAndroidContext() {

app/src/main/java/org/autojs/autojs/engine/ScriptEngineService.java

@@ -217,9 +217,7 @@ public class ScriptEngineService {
     }
 
     public Set<ScriptEngine<? extends ScriptSource>> getEngines() {
-        synchronized (mScriptEngineManager) {
-            return new LinkedHashSet<>(mScriptEngineManager.getEngines());
-        }
+        return mScriptEngineManager.getEngines();
     }
 
     public Collection<ScriptExecution> getScriptExecutions() {

app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.kt

@@ -61,7 +61,7 @@ open class TaskManagerFragment : ViewPagerFragment(45), ViewStatesManageable {
     }
 
     override fun onFabClick(fab: FloatingActionButton) {
-        AutoJs.instance.scriptEngineService.stopAll()
+        AutoJs.instance.scriptEngineService.stopAllAndToast()
     }
 
     override fun onBackPressed(activity: Activity) = false