#1990 fix: Passthrough the device id of the trigger to the key event action if one is not manually specified

Author: sds100

CHANGELOG.md

@@ -17,6 +17,7 @@
 - [#1971](https://github.com/keymapperorg/KeyMapper/issues/1971) Media actions work again in some apps, like YouTube.
 - [#1961](https://github.com/keymapperorg/KeyMapper/issues/1961) Disabling setup assistant shows a notification asking for pairing code immediately.
 - [#1983](https://github.com/keymapperorg/KeyMapper/issues/1983) Inputting a modifier key and another key as actions through Expert mode applies the correct key character map. 
+- [#1990](https://github.com/keymapperorg/KeyMapper/issues/1990) Passthrough the device id of the trigger to the key event action if one is not manually specified
 - Bugs with expert mode auto starting time.
 
 ## [4.0.0 Beta 6](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.06)

base/src/main/java/io/github/sds100/keymapper/base/actions/PerformActionTriggerDevice.kt

@@ -9,5 +9,10 @@ sealed class PerformActionTriggerDevice {
      */
     data class Evdev(val deviceId: Int) : PerformActionTriggerDevice()
 
+    /**
+     * The action was triggered by an Android InputDevice.
+     */
+    data class AndroidDevice(val deviceId: Int) : PerformActionTriggerDevice()
+
     data object Default : PerformActionTriggerDevice()
 }

base/src/main/java/io/github/sds100/keymapper/base/actions/PerformKeyEventActionDelegate.kt

@@ -47,7 +47,7 @@ class PerformKeyEventActionDelegate(
             return injectEvdevEvent(inputEventAction, triggerDevice.deviceId, action)
         }
 
-        val deviceId: Int = getDeviceIdForKeyEventAction(action)
+        val deviceId: Int = getAndroidDeviceIdForKeyEventAction(triggerDevice, action)
 
         // If the device that the user specified in the action can not be found
         // then fallback to evdev injection.
@@ -157,7 +157,10 @@ class PerformKeyEventActionDelegate(
         }
     }
 
-    private fun getDeviceIdForKeyEventAction(action: ActionData.InputKeyEvent): Int {
+    private fun getAndroidDeviceIdForKeyEventAction(
+        triggerDevice: PerformActionTriggerDevice,
+        action: ActionData.InputKeyEvent,
+    ): Int {
         if (action.device?.descriptor == null) {
             // automatically select a game controller as the input device for game controller key events
 
@@ -171,7 +174,10 @@ class PerformKeyEventActionDelegate(
                 }
             }
 
-            return 0
+            return when (triggerDevice) {
+                is PerformActionTriggerDevice.AndroidDevice -> triggerDevice.deviceId
+                else -> 0
+            }
         }
 
         val inputDevices = devicesAdapter.connectedInputDevices.value

base/src/main/java/io/github/sds100/keymapper/base/detection/KeyMapAlgorithm.kt

@@ -287,7 +287,6 @@ class KeyMapAlgorithm(
 
             val triggerActions = mutableListOf<IntArray>()
             val triggerConstraints = mutableListOf<Array<ConstraintState>>()
-            val triggerPerformActionDevices = mutableListOf<PerformActionTriggerDevice>()
 
             val sequenceTriggerActionPerformers =
                 mutableMapOf<Int, SequenceTriggerActionPerformer>()
@@ -1995,8 +1994,11 @@ class KeyMapAlgorithm(
 
     private fun AlgoEvent.performActionDevice(): PerformActionTriggerDevice {
         return when (this) {
-            is EvdevEventAlgo -> PerformActionTriggerDevice.Evdev(deviceId)
-            else -> PerformActionTriggerDevice.Default
+            is EvdevEventAlgo -> PerformActionTriggerDevice.Evdev(this.deviceId)
+            is KeyEventAlgo -> PerformActionTriggerDevice.AndroidDevice(this.deviceId)
+            is AssistantEvent -> PerformActionTriggerDevice.Default
+            is FingerprintGestureEvent -> PerformActionTriggerDevice.Default
+            is FloatingButtonEvent -> PerformActionTriggerDevice.Default
         }
     }
 }

base/src/test/java/io/github/sds100/keymapper/base/actions/PerformKeyEventActionDelegateTest.kt

@@ -68,6 +68,36 @@ class PerformKeyEventActionDelegateTest {
         )
     }
 
+    @Test
+    fun `use trigger device id if no device specified for action`() = runTest(testDispatcher) {
+        val action = ActionData.InputKeyEvent(
+            keyCode = KeyEvent.KEYCODE_A,
+            device = null,
+        )
+
+        delegate.perform(
+            action,
+            inputEventAction = InputEventAction.DOWN,
+            keyMetaState = 0,
+            triggerDevice = PerformActionTriggerDevice.AndroidDevice(deviceId = 3),
+        )
+
+        val expectedDownEvent = InjectKeyEventModel(
+            keyCode = KeyEvent.KEYCODE_A,
+            action = KeyEvent.ACTION_DOWN,
+            metaState = 0,
+            deviceId = 3,
+            scanCode = 0,
+            repeatCount = 0,
+            source = InputDevice.SOURCE_KEYBOARD,
+        )
+
+        verify(mockInputEventHub).injectKeyEvent(
+            expectedDownEvent,
+            useSystemBridgeIfAvailable = false,
+        )
+    }
+
     @Test
     fun `inject evdev event if action device set as a non-evdev device but it is disconnected`() =
         runTest(testDispatcher) {