From 77c0d6bd195c6ed4d8c4434f584d1cb89b1bbddf Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 31 Mar 2018 21:29:30 +0800
Subject: [PATCH] cleanup(autojs): ScriptRuntime.requiresApi()

---
 .../core/accessibility/SimpleActionAutomator.java    | 12 ++++++------
 .../java/com/stardust/autojs/runtime/api/Images.java |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
index 46990747..aaffd60b 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java
@@ -51,7 +51,7 @@ public class SimpleActionAutomator {
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     @ScriptInterface
     public ActionTarget editable(int i) {
-        mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
+        ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
         return new ActionTarget.EditableActionTarget(i);
     }
 
@@ -113,14 +113,14 @@ public class SimpleActionAutomator {
     @ScriptInterface
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public boolean setText(ActionTarget target, String text) {
-        mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
+        ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
         return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text));
     }
 
     @ScriptInterface
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public boolean appendText(ActionTarget target, String text) {
-        mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
+        ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
         return performAction(target.createAction(UiObject.ACTION_APPEND_TEXT, text));
     }
 
@@ -137,7 +137,7 @@ public class SimpleActionAutomator {
     @ScriptInterface
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public boolean powerDialog() {
-        mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
+        ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
         return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG);
     }
 
@@ -189,8 +189,8 @@ public class SimpleActionAutomator {
     }
 
     private void prepareForGesture() {
+        ScriptRuntime.requiresApi(24);
         ensureAccessibilityServiceEnabled();
-        mScriptRuntime.requiresApi(24);
         if (mGlobalActionAutomator != null)
             return;
         mGlobalActionAutomator = new GlobalActionAutomator(new Handler(mScriptRuntime.loopers.getServantLooper()));
@@ -237,7 +237,7 @@ public class SimpleActionAutomator {
     @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
     @ScriptInterface
     public boolean paste(ActionTarget target) {
-        mScriptRuntime.requiresApi(18);
+        ScriptRuntime.requiresApi(18);
         return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE));
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
index d9687dec..5dd8a326 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java
@@ -68,7 +68,7 @@ public class Images {
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public boolean requestScreenCapture(final int width, final int height) {
-        mScriptRuntime.requiresApi(21);
+        ScriptRuntime.requiresApi(21);
         final VolatileDispose<Boolean> requestResult = new VolatileDispose<>();
         mScreenCaptureRequester.setOnActivityResultCallback((result, data) -> {
             if (result == Activity.RESULT_OK) {
@@ -101,7 +101,7 @@ public class Images {
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public ImageWrapper captureScreen() {
-        mScriptRuntime.requiresApi(21);
+        ScriptRuntime.requiresApi(21);
         if (mScreenCapturer == null) {
             throw new SecurityException("No screen capture permission");
         }