fix: call Looper.loop()

Xtr126 · Feb 15, 2024 · 248558b · 248558b
1 parent fd0a1ff
commit 248558b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/src/main/java/xtr/keymapper/server/RemoteService.java b/app/src/main/java/xtr/keymapper/server/RemoteService.java
@@ -6,6 +6,7 @@
 import android.util.Log;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 
 import xtr.keymapper.ActivityObserver;
@@ -22,6 +23,7 @@ public class RemoteService extends IRemoteService.Stub {
     private OnKeyEventListener mOnKeyEventListener;
     private boolean isWaylandClient = false;
     private ActivityObserverService activityObserverService;
+    private static IRemoteService service = null;
 
     public RemoteService() {
 
@@ -31,6 +33,7 @@ public static void main(String[] args) {
         loadLibraries();
         Looper.prepareMainLooper();
         new RemoteService(args);
+        Looper.loop();
     }
 
     public RemoteService(String[] args) {
@@ -181,12 +184,17 @@ public static void loadLibraries() {
     }
 
     public static IRemoteService getInstance(){
-        try {
-            return new RemoteServiceSocketClient();
-        } catch (Throwable tr) {
-            Log.e(tr.toString(), tr.getMessage(), tr);
-            return IRemoteService.Stub.asInterface(ServiceManager.getService("xtmapper"));
+        if (service == null) {
+            try {
+                service = new RemoteServiceSocketClient();
+            } catch (IOException e) {
+                Log.e(e.toString(), e.getMessage(), e);
+                RemoteServiceSocketClient.socket = null;
+            }
+            if (RemoteServiceSocketClient.socket == null)
+                service = IRemoteService.Stub.asInterface(ServiceManager.getService("xtmapper"));
         }
+        return service;
     }
 
 }
diff --git a/app/src/main/java/xtr/keymapper/server/RemoteServiceSocketClient.java b/app/src/main/java/xtr/keymapper/server/RemoteServiceSocketClient.java
@@ -18,7 +18,7 @@
 public class RemoteServiceSocketClient implements IRemoteService {
 
     // Socket should stay alive
-    public static LocalSocket socket;
+    public static LocalSocket socket = null;
 
     public RemoteServiceSocketClient() throws IOException {
         if (socket == null) {