fix: use single WindowManager instance

Xtr126 · Aug 4, 2024 · c7ef61d · c7ef61d
1 parent 5bfe7c8
commit c7ef61d
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/app/src/main/java/xtr/keymapper/server/RemoteService.java b/app/src/main/java/xtr/keymapper/server/RemoteService.java
@@ -41,6 +41,7 @@ public class RemoteService extends IRemoteService.Stub {
     private Context context = null;
     private int TYPE_SECURE_SYSTEM_OVERLAY;
     Handler mHandler = new Handler(Looper.getMainLooper());
+    private WindowManager windowManager;
 
     public RemoteService() {
 
@@ -53,6 +54,7 @@ public RemoteService(Context context) {
     }
 
     public RemoteService init(Context context) {
+        windowManager = context.getSystemService(WindowManager.class);
         PackageManager pm = context.getPackageManager();
         String packageName = context.getPackageName();
         try {
@@ -62,7 +64,6 @@ public RemoteService init(Context context) {
         } catch (PackageManager.NameNotFoundException e) {
             throw new RuntimeException(e);
         }
-
         this.context = context;
         return this;
     }
@@ -74,7 +75,6 @@ public void destroy() {
     }
 
     private void addCursorView() {
-        WindowManager windowManager = context.getSystemService(WindowManager.class);
         WindowManager.LayoutParams params = new WindowManager.LayoutParams(
                 WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT,
                 TYPE_SECURE_SYSTEM_OVERLAY,
@@ -88,12 +88,18 @@ private void addCursorView() {
                 // through the cursor
                 PixelFormat.TRANSLUCENT);
 
-        mHandler.post(() -> windowManager.addView(cursorView, params));
+        mHandler.post(() -> {
+            if(cursorView != null) windowManager.addView(cursorView, params);
+        });
     }
 
     private void removeCursorView() {
-        WindowManager windowManager = context.getSystemService(WindowManager.class);
-        mHandler.post(() -> windowManager.removeView(cursorView));
+        mHandler.post(() -> {
+            cursorView.setVisibility(View.GONE);
+            if (cursorView.isAttachedToWindow()) windowManager.removeView(cursorView);
+            cursorView.invalidate();
+            cursorView = null;
+        });
     }
 
     public void prepareCursorOverlayWindow() throws NoSuchMethodException, NoSuchFieldException, IllegalAccessException, InvocationTargetException {
@@ -102,7 +108,6 @@ public void prepareCursorOverlayWindow() throws NoSuchMethodException, NoSuchFie
         cursorView = CursorBinding.inflate(layoutInflater).getRoot();
         TYPE_SECURE_SYSTEM_OVERLAY = WindowManager.LayoutParams.class.getField("TYPE_SECURE_SYSTEM_OVERLAY").getInt(null);
         Binder sWindowToken = new Binder();
-        WindowManager windowManager = context.getSystemService(WindowManager.class);
         Method setDefaultTokenMethod = windowManager.getClass().getMethod("setDefaultToken", IBinder.class);
         setDefaultTokenMethod.invoke(windowManager, sWindowToken);
     }
@@ -173,7 +178,7 @@ public void startServer(KeymapProfile profile, KeymapConfig keymapConfig, IRemot
             } catch (Exception e) {
                 Log.e("overlayWindow", e.getMessage(), e);
             }
-            if (cursorView != null) addCursorView();
+            addCursorView();
         } else {
             cursorView = null;
         }