fix: use release key mapper relay service when sending key events TO key mapper

Author: sds100

app/src/main/java/io/github/sds100/keymapper/inputmethod/latin/KeyEventRelayServiceWrapper.kt

@@ -6,11 +6,13 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.DeadObjectException
 import android.os.IBinder
+import android.os.RemoteException
 import android.util.Log
 import android.view.KeyEvent
 import io.github.sds100.keymapper.api.IKeyEventRelayService
 import io.github.sds100.keymapper.api.IKeyEventRelayServiceCallback
 
+
 /**
  * This handles connecting to the relay service and exposes an interface
  * so other parts of the app can get a reference to the service even when it isn't
@@ -38,16 +40,17 @@ class KeyEventRelayServiceWrapperImpl(
             ) {
                 synchronized(keyEventRelayServiceLock) {
                     keyEventRelayService = IKeyEventRelayService.Stub.asInterface(service)
-                    Log.e(LatinIME.TAG, "Register callback")
+                    Log.d(LatinIME.TAG, "Register with key event relay service")
                     keyEventRelayService?.registerCallback(callback)
                 }
             }
 
             override fun onServiceDisconnected(name: ComponentName?) {
                 synchronized(keyEventRelayServiceLock) {
                     try {
+                        Log.d(LatinIME.TAG, "Unregister with key event relay service")
                         keyEventRelayService?.unregisterCallback()
-                    } catch (_: DeadObjectException) {
+                    } catch (_: RemoteException) {
                     } finally {
                         keyEventRelayService = null
                     }
@@ -79,7 +82,11 @@ class KeyEventRelayServiceWrapperImpl(
             val component =
                 ComponentName(servicePackageName, "io.github.sds100.keymapper.api.KeyEventRelayService")
             relayServiceIntent.setComponent(component)
-            ctx.bindService(relayServiceIntent, serviceConnection, 0)
+            val isSuccess = ctx.bindService(relayServiceIntent, serviceConnection, 0)
+
+            if (!isSuccess) {
+                ctx.unbindService(serviceConnection)
+            }
         } catch (e: SecurityException) {
             Log.e(LatinIME.TAG, e.toString())
         }

app/src/main/java/io/github/sds100/keymapper/inputmethod/latin/LatinIME.java

@@ -1936,8 +1936,8 @@ private HardwareEventDecoder getHardwareKeyEventDecoder(final int deviceId) {
     @Override
     public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) {
 
-        if (mKeyEventRelayServiceWrapperDebug != null) {
-            if (mKeyEventRelayServiceWrapperDebug.sendKeyEvent(keyEvent, "io.github.sds100.keymapper")) {
+        if (mKeyEventRelayServiceWrapperRelease != null) {
+            if (mKeyEventRelayServiceWrapperRelease.sendKeyEvent(keyEvent, "io.github.sds100.keymapper")) {
                 return true;
             }
         }
@@ -1968,8 +1968,8 @@ public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) {
 
     @Override
     public boolean onKeyUp(final int keyCode, final KeyEvent keyEvent) {
-        if (mKeyEventRelayServiceWrapperDebug != null) {
-            if (mKeyEventRelayServiceWrapperDebug.sendKeyEvent(keyEvent, "io.github.sds100.keymapper")) {
+        if (mKeyEventRelayServiceWrapperRelease != null) {
+            if (mKeyEventRelayServiceWrapperRelease.sendKeyEvent(keyEvent, "io.github.sds100.keymapper")) {
                 return true;
             }
         }