Improved reliability and speed

BaronKiko · Mar 21, 2017 · 51c1ed5 · 51c1ed5
1 parent 71c3b85
commit 51c1ed5
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/app/src/main/java/com/baronkiko/launcherhijack/AccServ.java b/app/src/main/java/com/baronkiko/launcherhijack/AccServ.java
@@ -18,18 +18,22 @@ public Intent GetDesiredIntent()
         return new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME).setPackage(s).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS|Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
     }
 
+    private void PerformHomePress()
+    {
+        performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            Log.wtf(TAG,e);
+        }
+        performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK);
+        startActivity(GetDesiredIntent());
+    }
+
     @Override
     public void onAccessibilityEvent(AccessibilityEvent event) {
-        if(event.getPackageName().equals("com.amazon.firelauncher")) {
-            performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                Log.wtf(TAG,e);
-            }
-            performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
-            startActivity(GetDesiredIntent());
-        }
+        if(event.getPackageName().equals("com.amazon.firelauncher"))
+            PerformHomePress();
     }
 
     @Override
@@ -47,14 +51,7 @@ protected void onServiceConnected() {
         info.feedbackType = AccessibilityServiceInfo.FEEDBACK_GENERIC;
         info.packageNames = new String[]{"com.amazon.firelauncher"};
         setServiceInfo(info);
-performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                Log.wtf(TAG,e);
-            }
-            performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
-            startActivity(GetDesiredIntent());
+        PerformHomePress();
     }
 
 }