From 6128aa28a6402a535e5619e6198c961828209b39 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sat, 9 Dec 2017 10:45:14 +0800
Subject: [PATCH] chore: add ensureAccessibilityServiceEnabled() to
 currentPackage(), currentActivity(), events.observeKey()

---
 autojs/src/main/assets/modules/__general__.js          |  2 ++
 .../java/com/stardust/autojs/runtime/api/Events.java   | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/autojs/src/main/assets/modules/__general__.js b/autojs/src/main/assets/modules/__general__.js
index 996b6dca..0251b975 100644
--- a/autojs/src/main/assets/modules/__general__.js
+++ b/autojs/src/main/assets/modules/__general__.js
@@ -38,10 +38,12 @@ module.exports = function(__runtime__, scope){
     }
 
     scope.currentPackage = function(){
+        scope.auto();
         return __runtime__.info.getLatestPackage();
     }
 
     scope.currentActivity = function(){
+        scope.auto();
         return __runtime__.info.getLatestActivity();
     }
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
index cadda4c8..50245c72 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java
@@ -11,6 +11,7 @@ import android.view.accessibility.AccessibilityEvent;
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
 import com.stardust.autojs.core.eventloop.EventEmitter;
+import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.notification.Notification;
 import com.stardust.notification.NotificationListenerService;
 import com.stardust.autojs.runtime.ScriptBridges;
@@ -40,12 +41,14 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
     private Loopers mLoopers;
     private Handler mHandler;
     private boolean mListeningNotification = false;
+    private ScriptRuntime mScriptRuntime;
 
-    public Events(Context context, AccessibilityBridge accessibilityBridge, ScriptBridges bridges, Loopers loopers) {
-        super(bridges);
+    public Events(Context context, AccessibilityBridge accessibilityBridge, ScriptRuntime runtime) {
+        super(runtime.bridges);
         mAccessibilityBridge = accessibilityBridge;
         mContext = context;
-        mLoopers = loopers;
+        mLoopers = runtime.loopers;
+        mScriptRuntime = runtime;
     }
 
     public EventEmitter emitter() {
@@ -55,6 +58,7 @@ public class Events extends EventEmitter implements OnKeyListener, TouchObserver
     public void observeKey() {
         if (mListeningKey)
             return;
+        mScriptRuntime.ensureAccessibilityServiceEnabled();
         AccessibilityService service = mAccessibilityBridge.getService();
         if (service == null)
             throw new ScriptException("AccessibilityService = null");