fix: pause/resume keymap when launching editor

Xtr126 · Aug 8, 2023 · 70cd485 · 70cd485
1 parent 2632734
commit 70cd485
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/java/xtr/keymapper/editor/EditorService.java b/app/src/main/java/xtr/keymapper/editor/EditorService.java
@@ -15,6 +15,7 @@
 import xtr.keymapper.R;
 import xtr.keymapper.profiles.ProfileSelector;
 import xtr.keymapper.server.RemoteService;
+import xtr.keymapper.server.RemoteServiceHelper;
 
 public class EditorService extends Service implements EditorUI.OnHideListener {
     private EditorUI editor;
@@ -23,9 +24,9 @@ public class EditorService extends Service implements EditorUI.OnHideListener {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         mService = RemoteService.getInstance();
+       RemoteServiceHelper.pauseKeymap();
 
         if (editor != null) editor.hideView();
-
         ProfileSelector.select(this, profile -> {
             editor = new EditorUI(this, profile);
             editor.open();
@@ -58,6 +59,7 @@ public void onHideView() {
         } catch (RemoteException ignored) {
         }
         editor = null;
+        RemoteServiceHelper.resumeKeymap();
         stopSelf();
     }
 

diff --git a/app/src/main/java/xtr/keymapper/server/RemoteService.java b/app/src/main/java/xtr/keymapper/server/RemoteService.java
@@ -109,8 +109,10 @@ public void unregisterOnKeyEventListener(OnKeyEventListener l)  {
         }
 
         public void pauseMouse(){
-            inputService.setMouseLock(false);
-            inputService.stopEvents = true;
+            if (inputService != null) {
+                inputService.setMouseLock(false);
+                inputService.stopEvents = true;
+            }
         }
 
         @Override
@@ -119,8 +121,10 @@ public void reloadKeymap() {
         }
 
         public void resumeMouse(){
-            inputService.setMouseLock(true);
-            inputService.stopEvents = false;
+            if (inputService != null) {
+                inputService.setMouseLock(true);
+                inputService.stopEvents = false;
+            }
         }
     };