#1926 fix: PRO mode key maps work after disconnecting and connecting the devices

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/input/EvdevDevicesDelegate.kt

@@ -51,24 +51,22 @@ class EvdevDevicesDelegate @Inject constructor(
 
     init {
         coroutineScope.launch {
-            coroutineScope.launch {
-                // Only listen to changes in the connected input devices if the system bridge
-                // is connected.
-                systemBridgeConnectionManager.connectionState.flatMapLatest { connectionState ->
-                    when (connectionState) {
-                        is SystemBridgeConnectionState.Connected -> {
-                            devicesAdapter.connectedInputDevices.onEach {
-                                allDevices.value = fetchAllDevices()
-                            }
-                        }
-                        is SystemBridgeConnectionState.Disconnected -> {
-                            allDevices.value = emptyList()
-                            grabbedDevicesById.value = emptyMap()
-                            emptyFlow()
+            // Only listen to changes in the connected input devices if the system bridge
+            // is connected.
+            systemBridgeConnectionManager.connectionState.flatMapLatest { connectionState ->
+                when (connectionState) {
+                    is SystemBridgeConnectionState.Connected -> {
+                        devicesAdapter.connectedInputDevices.onEach {
+                            allDevices.value = fetchAllDevices()
                         }
                     }
-                }.collect()
-            }
+                    is SystemBridgeConnectionState.Disconnected -> {
+                        allDevices.value = emptyList()
+                        grabbedDevicesById.value = emptyMap()
+                        emptyFlow()
+                    }
+                }
+            }.collect()
         }
 
         // Process on another thread because system bridge grabbing calls are blocking

system/src/main/java/io/github/sds100/keymapper/system/devices/AndroidDevicesAdapter.kt

@@ -4,8 +4,6 @@ import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.hardware.input.InputManager
-import android.os.Handler
-import android.os.Looper
 import android.view.InputDevice
 import androidx.core.content.getSystemService
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -37,7 +35,8 @@ class AndroidDevicesAdapter @Inject constructor(
     private val bluetoothAdapter: io.github.sds100.keymapper.system.bluetooth.BluetoothAdapter,
     private val permissionAdapter: PermissionAdapter,
     private val coroutineScope: CoroutineScope,
-) : DevicesAdapter {
+) : DevicesAdapter,
+    InputManager.InputDeviceListener {
 
     private val ctx = context.applicationContext
     private val inputManager = ctx.getSystemService<InputManager>()
@@ -69,40 +68,7 @@ class AndroidDevicesAdapter @Inject constructor(
             }
         }
 
-        inputManager?.apply {
-            registerInputDeviceListener(
-                object : InputManager.InputDeviceListener {
-                    override fun onInputDeviceAdded(deviceId: Int) {
-                        coroutineScope.launch {
-                            val device = InputDevice.getDevice(deviceId) ?: return@launch
-                            onInputDeviceConnect.emit(
-                                InputDeviceUtils.createInputDeviceInfo(device),
-                            )
-
-                            updateInputDevices()
-                        }
-                    }
-
-                    override fun onInputDeviceRemoved(deviceId: Int) {
-                        coroutineScope.launch {
-                            connectedInputDevices.value.ifIsData { connectedInputDevices ->
-                                val device = connectedInputDevices.find { it.id == deviceId }
-                                    ?: return@ifIsData
-
-                                onInputDeviceDisconnect.emit(device)
-                            }
-
-                            updateInputDevices()
-                        }
-                    }
-
-                    override fun onInputDeviceChanged(deviceId: Int) {
-                        updateInputDevices()
-                    }
-                },
-                Handler(Looper.getMainLooper()),
-            )
-        }
+        inputManager?.registerInputDeviceListener(this, null)
 
         bluetoothAdapter.onDeviceConnect.onEach { device ->
             val currentValue = connectedBluetoothDevices.value
@@ -146,6 +112,34 @@ class AndroidDevicesAdapter @Inject constructor(
         return InputDevice.getDevice(deviceId)?.let { InputDeviceUtils.createInputDeviceInfo(it) }
     }
 
+    override fun onInputDeviceAdded(deviceId: Int) {
+        coroutineScope.launch {
+            val device = InputDevice.getDevice(deviceId) ?: return@launch
+            onInputDeviceConnect.emit(
+                InputDeviceUtils.createInputDeviceInfo(device),
+            )
+
+            updateInputDevices()
+        }
+    }
+
+    override fun onInputDeviceRemoved(deviceId: Int) {
+        coroutineScope.launch {
+            connectedInputDevices.value.ifIsData { connectedInputDevices ->
+                val device = connectedInputDevices.find { it.id == deviceId }
+                    ?: return@ifIsData
+
+                onInputDeviceDisconnect.emit(device)
+            }
+
+            updateInputDevices()
+        }
+    }
+
+    override fun onInputDeviceChanged(deviceId: Int) {
+        updateInputDevices()
+    }
+
     private fun updateInputDevices() {
         val devices = mutableListOf<InputDeviceInfo>()