diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 860d3d2478..b4968c7110 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -588,7 +588,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Log.i(TAG, "input device $deviceId disconnected") dropMouseCursor() backQamInput.onDeviceRemoved(deviceId) - mouseBackInput.cancel() + mouseBackInput.onDeviceRemoved(deviceId) joyConVr?.refresh() padBridge?.onDeviceRemoved(deviceId) if (::padMouse.isInitialized) padMouse.reset() diff --git a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt index e695db5178..261c88a74b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt @@ -37,6 +37,13 @@ class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouse sendRight(false) } + fun onDeviceRemoved(deviceId: Int) { + if (held.isEmpty()) return + held.remove(deviceId) + if (!mouseAttached()) held.remove(KeyCharacterMap.VIRTUAL_KEYBOARD) + if (held.isEmpty()) sendRight(false) + } + companion object { fun isFromMouse(event: KeyEvent): Boolean = event.isFromSource(InputDevice.SOURCE_MOUSE) || event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE) diff --git a/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt index 8a755f6e9a..625f93e7cf 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt @@ -85,6 +85,26 @@ class MouseBackInputTest { assertEquals(listOf(true, false), presses) } + @Test fun anUnrelatedDeviceDisconnectingKeepsTheButtonHeld() { + input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = true) + input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true) + input.onDeviceRemoved(9) + assertEquals(listOf(true), presses) + } + + @Test fun theMouseDisconnectingReleasesItsPress() { + input.onKeyEvent(key(KeyEvent.ACTION_DOWN), toGuest = true) + input.onDeviceRemoved(7) + assertEquals(listOf(true, false), presses) + } + + @Test fun theLastMouseDisconnectingReleasesAnInjectedPress() { + input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true) + mouse = false + input.onDeviceRemoved(7) + assertEquals(listOf(true, false), presses) + } + @Test fun cancelReleasesAHeldPressOnce() { input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true) input.cancel()