From b33ec58e578fc3d3ccf5f8756131727666b777da Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 24 Jun 2017 20:48:13 +0800
Subject: [PATCH] add #197 : start accessibility settings automatically

---
 .../main/java/com/stardust/scriptdroid/autojs/AutoJs.java   | 1 +
 .../scriptdroid/ui/error/AbstractIssueReporterActivity.java | 3 ++-
 .../stardust/scriptdroid/ui/error/ErrorReportActivity.java  | 4 +++-
 .../main/java/com/stardust/autojs/ScriptEngineService.java  | 6 ------
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
index 036ddb36..24b2d005 100644
--- a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
+++ b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
@@ -206,6 +206,7 @@ public class AutoJs implements AccessibilityBridge {
                 }
             }
             if (errorMessage != null) {
+                AccessibilityServiceTool.goToAccessibilitySetting();
                 throw new ScriptStopException(errorMessage);
             }
         }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
index bb0d8ed8..f5274c14 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
@@ -35,6 +35,7 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.github.aakira.expandablelayout.BuildConfig;
 import com.github.aakira.expandablelayout.ExpandableRelativeLayout;
 import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo;
 import com.heinrichreimersoftware.androidissuereporter.model.Report;
@@ -138,7 +139,7 @@ public abstract class AbstractIssueReporterActivity extends AppCompatActivity {
         if (errorDetail != null) {
             inputDescription.setText(errorDetail);
             String title = getFirstLine(errorDetail);
-            inputTitle.setText(title);
+            inputTitle.setText("[" + BuildConfig.VERSION_CODE + "]" + title);
             mCrash = true;
         }
     }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
index ffb7de6c..d42aacf2 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
@@ -15,10 +15,12 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.stardust.scriptdroid.BuildConfig;
 import com.stardust.scriptdroid.ui.BaseActivity;
 import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
 import com.stardust.scriptdroid.R;
 
+import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -116,7 +118,7 @@ public class ErrorReportActivity extends BaseActivity {
     }
 
     private String getDeviceMessage() {
-        return "Android: " + Build.VERSION.SDK_INT + "\n";
+        return String.format(Locale.getDefault(), "Version: %s\nAndroid: %d", BuildConfig.VERSION_CODE, Build.VERSION.SDK_INT);
     }
 
     private void exitAfter(long millis) {
diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
index 135b4501..db782141 100644
--- a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
+++ b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
@@ -125,12 +125,6 @@ public class ScriptEngineService {
             task.setExecutionListener(mScriptExecutionObserver);
         }
         if (isUiMode(task)) {
-            mUiHandler.post(new Runnable() {
-                @Override
-                public void run() {
-
-                }
-            });
             return ScriptExecuteActivity.execute(mContext, this, task);
         } else {
             RunnableScriptExecution scriptExecution = new RunnableScriptExecution(this, task);