fix: exit process to avoid ANR on clicking stop button

Xtr126 · Sep 21, 2024 · 7ef9e7a · 7ef9e7a
1 parent dd902e1
commit 7ef9e7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/xtr/keymapper/server/RemoteService.java b/app/src/main/java/xtr/keymapper/server/RemoteService.java
@@ -46,8 +46,8 @@ public class RemoteService extends IRemoteService.Stub {
     private final WindowManager windowManager;
     final Context context;
     public static final String TAG = "xtmapper-server";
+    boolean startedFromShell = false;
 
-    /* For Shizuku UserService */
     public RemoteService(Context context) {
         loadLibraries();
         this.context = context;
@@ -226,7 +226,9 @@ public void startServer(KeymapProfile profile, KeymapConfig keymapConfig, IRemot
 
     @Override
     public void stopServer() {
-        if (inputService != null && !isWaylandClient) {
+        if (!startedFromShell) {
+            System.exit(0);
+        } else if (inputService != null && !isWaylandClient) {
             inputService.stopEvents = true;
             inputService.hideCursor();
             inputService.stop();

diff --git a/app/src/main/java/xtr/keymapper/server/RemoteServiceShell.java b/app/src/main/java/xtr/keymapper/server/RemoteServiceShell.java
@@ -23,6 +23,7 @@ public static void main(String[] args) {
             RemoteService.loadLibraries();
             Looper.prepareMainLooper();
             RemoteService mService = new RemoteService(getContext());
+            mService.startedFromShell = true;
 
             boolean launchApp = true;
             for (String arg: args) {