Merge pull request #2337 from switchifyapp/feature/pc-pointer-profile-movement-2336

enaboapps · web-flow · commit 6c3edb913c7e · 2026-06-07T14:07:36.000+01:00
Use PC pointer profile for mouse movement
diff --git a/app/src/main/java/com/enaboapps/switchify/pc/PcPointerProfile.kt b/app/src/main/java/com/enaboapps/switchify/pc/PcPointerProfile.kt
@@ -0,0 +1,22 @@
+package com.enaboapps.switchify.pc
+
+data class PcPointerMovementProfile(
+    val displayId: String,
+    val scaleFactor: Double,
+    val bounds: PcPointerBounds,
+    val maxDelta: Int,
+    val recommendedDeltas: PcPointerDeltas
+)
+
+data class PcPointerBounds(
+    val x: Int,
+    val y: Int,
+    val width: Int,
+    val height: Int
+)
+
+data class PcPointerDeltas(
+    val small: Int,
+    val medium: Int,
+    val large: Int
+)
diff --git a/app/src/main/java/com/enaboapps/switchify/pc/PcProtocol.kt b/app/src/main/java/com/enaboapps/switchify/pc/PcProtocol.kt
@@ -10,6 +10,7 @@ import javax.crypto.spec.SecretKeySpec
 sealed class PcProtocolResponse {
     data class Ack(val id: String) : PcProtocolResponse()
     data class PairingComplete(val id: String, val desktopId: String, val deviceId: String, val token: String) : PcProtocolResponse()
+    data class PointerProfile(val id: String, val profile: PcPointerMovementProfile) : PcProtocolResponse()
     data class Error(val id: String?, val code: String, val message: String) : PcProtocolResponse()
     data object Invalid : PcProtocolResponse()
 }
@@ -49,6 +50,17 @@ object PcProtocol {
         )
     }
 
+    fun pointerProfile(id: String, deviceId: String, token: String, timestamp: Long): String {
+        return authenticatedCommand(
+            id = id,
+            deviceId = deviceId,
+            token = token,
+            timestamp = timestamp,
+            type = "pointer.profile",
+            payload = JSONObject()
+        )
+    }
+
     fun authenticatedCommand(
         id: String,
         deviceId: String,
@@ -98,6 +110,7 @@ object PcProtocol {
                         ?: PcProtocolResponse.Invalid
                 }
                 "pairing.complete" -> parsePairingComplete(json)
+                "pointer.profile" -> parsePointerProfile(json)
                 "error" -> {
                     val error = json.optJSONObject("error") ?: return@runCatching PcProtocolResponse.Invalid
                     PcProtocolResponse.Error(
@@ -168,4 +181,48 @@ object PcProtocol {
         }
         return PcProtocolResponse.PairingComplete(id, desktopId, deviceId, token)
     }
+
+    private fun parsePointerProfile(json: JSONObject): PcProtocolResponse {
+        if (!json.optBoolean("ok") || !json.isNull("error")) return PcProtocolResponse.Invalid
+        val id = json.optString("id").takeIf { it.isNotBlank() } ?: return PcProtocolResponse.Invalid
+        val payload = json.optJSONObject("payload") ?: return PcProtocolResponse.Invalid
+        val displayId = payload.optString("displayId").takeIf { it.isNotBlank() } ?: return PcProtocolResponse.Invalid
+        val scaleFactor = payload.optDouble("scaleFactor")
+        val boundsJson = payload.optJSONObject("bounds") ?: return PcProtocolResponse.Invalid
+        val maxDelta = payload.optInt("maxDelta")
+        val deltasJson = payload.optJSONObject("recommendedDeltas") ?: return PcProtocolResponse.Invalid
+        val bounds = PcPointerBounds(
+            x = boundsJson.optInt("x"),
+            y = boundsJson.optInt("y"),
+            width = boundsJson.optInt("width"),
+            height = boundsJson.optInt("height")
+        )
+        val deltas = PcPointerDeltas(
+            small = deltasJson.optInt("small"),
+            medium = deltasJson.optInt("medium"),
+            large = deltasJson.optInt("large")
+        )
+        if (
+            !scaleFactor.isFinite() ||
+            scaleFactor <= 0.0 ||
+            bounds.width <= 0 ||
+            bounds.height <= 0 ||
+            maxDelta <= 0 ||
+            deltas.small <= 0 ||
+            deltas.medium <= 0 ||
+            deltas.large <= 0
+        ) {
+            return PcProtocolResponse.Invalid
+        }
+        return PcProtocolResponse.PointerProfile(
+            id = id,
+            profile = PcPointerMovementProfile(
+                displayId = displayId,
+                scaleFactor = scaleFactor,
+                bounds = bounds,
+                maxDelta = maxDelta,
+                recommendedDeltas = deltas
+            )
+        )
+    }
 }
diff --git a/app/src/main/java/com/enaboapps/switchify/pc/SwitchifyPcClient.kt b/app/src/main/java/com/enaboapps/switchify/pc/SwitchifyPcClient.kt
@@ -46,6 +46,7 @@ sealed class PcLiveControlResult {
 }
 
 interface PcMouseControlConnection {
+    val pointerProfile: PcPointerMovementProfile?
     suspend fun sendMouseCommand(command: PcMouseCommand): PcCommandResult
     fun close()
 }
@@ -193,7 +194,8 @@ class SwitchifyPcClient(
                     LiveMouseControlConnection(
                         webSocketSession = webSocketSession,
                         authenticatedSession = session,
-                        token = token
+                        token = token,
+                        pointerProfile = requestPointerProfile(webSocketSession, session, token)
                     )
                 )
                 is PcProtocolResponse.Error -> {
@@ -209,7 +211,8 @@ class SwitchifyPcClient(
         } catch (error: Throwable) {
             if (error is CancellationException) throw error
             webSocketSession?.close()
-            PcLiveControlResult.Failed()
+            if (error is InvalidPcAuthException) PcLiveControlResult.AuthFailed()
+            else PcLiveControlResult.Failed()
         }
     }
 
@@ -231,12 +234,44 @@ class SwitchifyPcClient(
             when (response) {
                 is PcProtocolResponse.Ack -> if (response.id == requestId) return response
                 is PcProtocolResponse.PairingComplete -> if (response.id == requestId) return response
+                is PcProtocolResponse.PointerProfile -> if (response.id == requestId) return response
                 is PcProtocolResponse.Error -> if (response.id == requestId || response.id == null) return response
                 PcProtocolResponse.Invalid -> return response
             }
         }
     }
 
+    private suspend fun requestPointerProfile(
+        webSocketSession: WebSocketSession,
+        session: PcAuthenticatedSession,
+        token: String
+    ): PcPointerMovementProfile? {
+        return try {
+            val requestId = nextRequestId()
+            webSocketSession.send(
+                Frame.Text(
+                    PcProtocol.pointerProfile(
+                        id = requestId,
+                        deviceId = session.deviceId,
+                        token = token,
+                        timestamp = System.currentTimeMillis()
+                    )
+                )
+            )
+            when (val response = withTimeout(5_000) { readExpectedResponse(webSocketSession, requestId) }) {
+                is PcProtocolResponse.PointerProfile -> response.profile
+                is PcProtocolResponse.Error -> {
+                    if (response.code == "invalid_auth") throw InvalidPcAuthException()
+                    null
+                }
+                else -> null
+            }
+        } catch (error: Throwable) {
+            if (error is CancellationException || error is InvalidPcAuthException) throw error
+            null
+        }
+    }
+
     private fun nextRequestId(): String = "android-${UUID.randomUUID()}"
 
     private fun PcMouseCommand.toMessage(id: String, deviceId: String, token: String, timestamp: Long): String {
@@ -252,7 +287,8 @@ class SwitchifyPcClient(
     private inner class LiveMouseControlConnection(
         private val webSocketSession: WebSocketSession,
         private val authenticatedSession: PcAuthenticatedSession,
-        private val token: String
+        private val token: String,
+        override val pointerProfile: PcPointerMovementProfile?
     ) : PcMouseControlConnection {
         override suspend fun sendMouseCommand(command: PcMouseCommand): PcCommandResult {
             return runCatching {
@@ -282,4 +318,6 @@ class SwitchifyPcClient(
             webSocketSession.cancel()
         }
     }
+
+    private class InvalidPcAuthException : RuntimeException()
 }
diff --git a/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGrid.kt b/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGrid.kt
@@ -27,6 +27,7 @@ data class PcMouseControlSpec(
 @Composable
 fun PcMouseCommandGrid(
     connected: Boolean,
+    movementStep: Int,
     busyCommand: PcMouseCommand?,
     onCommandSelected: (PcMouseCommand) -> Unit,
     modifier: Modifier = Modifier
@@ -38,7 +39,7 @@ fun PcMouseCommandGrid(
         verticalArrangement = Arrangement.spacedBy(12.dp),
         horizontalArrangement = Arrangement.spacedBy(12.dp)
     ) {
-        items(pcMouseControlSpecs()) { control ->
+        items(pcMouseControlSpecs(movementStep)) { control ->
             Button(
                 onClick = { onCommandSelected(control.command) },
                 enabled = connected && busyCommand == null,
@@ -55,8 +56,8 @@ fun PcMouseCommandGrid(
     }
 }
 
-fun pcMouseControlSpecs(): List<PcMouseControlSpec> {
-    val step = 80
+fun pcMouseControlSpecs(moveStep: Int): List<PcMouseControlSpec> {
+    val step = moveStep.coerceAtLeast(1)
     val scrollStep = 5
     return listOf(
         PcMouseControlSpec(R.string.pc_mouse_up_left, PcMouseCommand.Move(-step, -step)),
diff --git a/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlActivity.kt b/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlActivity.kt
@@ -118,6 +118,7 @@ private fun PcMouseControlScreen(
                 }
                 PcMouseCommandGrid(
                     connected = uiState.connectedDisplayName != null,
+                    movementStep = uiState.movementStep,
                     busyCommand = uiState.busyCommand,
                     onCommandSelected = viewModel::send
                 )
diff --git a/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlViewModel.kt b/app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlViewModel.kt
@@ -13,6 +13,7 @@ import com.enaboapps.switchify.pc.PcDeviceIdentityRepository
 import com.enaboapps.switchify.pc.PcMouseCommand
 import com.enaboapps.switchify.pc.PcAuthenticatedSession
 import com.enaboapps.switchify.pc.PcPairingTokenStore
+import com.enaboapps.switchify.pc.PcPointerMovementProfile
 import com.enaboapps.switchify.pc.PcTokenStore
 import com.enaboapps.switchify.pc.SwitchifyPcClient
 import kotlinx.coroutines.CompletableDeferred
@@ -27,6 +28,7 @@ import kotlinx.coroutines.launch
 
 data class PcMouseControlUiState(
     val connectedDisplayName: String? = null,
+    val movementStep: Int = PcMouseControlViewModel.DEFAULT_MOVE_STEP,
     val isBusy: Boolean = false,
     val busyCommand: PcMouseCommand? = null,
     val message: String? = null
@@ -54,7 +56,10 @@ class PcMouseControlViewModel(
         viewModelScope.launch {
             PcConnectionStateHolder.connectionState.collect { state ->
                 _uiState.update {
-                    it.copy(connectedDisplayName = (state as? PcConnectionState.Connected)?.displayName)
+                    it.copy(
+                        connectedDisplayName = (state as? PcConnectionState.Connected)?.displayName,
+                        movementStep = if (state is PcConnectionState.Connected) it.movementStep else DEFAULT_MOVE_STEP
+                    )
                 }
                 when (state) {
                     is PcConnectionState.Connected -> ensureLiveConnection(state.session)
@@ -129,6 +134,9 @@ class PcMouseControlViewModel(
             when (val result = connector.openMouseControlSession(session)) {
                 is PcLiveControlResult.Connected -> {
                     liveConnection = result.connection
+                    _uiState.update {
+                        it.copy(movementStep = result.connection.pointerProfile?.smallMovementStep() ?: DEFAULT_MOVE_STEP)
+                    }
                     result.connection
                 }
                 is PcLiveControlResult.AuthFailed -> {
@@ -137,6 +145,7 @@ class PcMouseControlViewModel(
                     _uiState.update {
                         it.copy(
                             connectedDisplayName = null,
+                            movementStep = DEFAULT_MOVE_STEP,
                             isBusy = false,
                             busyCommand = null,
                             message = CONNECT_FIRST_MESSAGE
@@ -164,7 +173,12 @@ class PcMouseControlViewModel(
         liveConnectionDeferred = null
     }
 
+    private fun PcPointerMovementProfile.smallMovementStep(): Int {
+        return recommendedDeltas.small.coerceIn(1, maxDelta)
+    }
+
     companion object {
+        const val DEFAULT_MOVE_STEP = 40
         const val CONNECT_FIRST_MESSAGE = "Connect to PC from Switchify first."
         const val COMMAND_FAILED_MESSAGE = "Could not send command to PC."
     }
diff --git a/app/src/test/java/com/enaboapps/switchify/pc/PcProtocolTest.kt b/app/src/test/java/com/enaboapps/switchify/pc/PcProtocolTest.kt
@@ -68,6 +68,63 @@ class PcProtocolTest {
         assertEquals("o0CHNFgcFjPSL1PaWzBP6riHHr9V8kxo-qTKAPUvT7A", proof)
     }
 
+    @Test
+    fun buildsPointerProfileCommandWithAuthProof() {
+        val json = JSONObject(
+            PcProtocol.pointerProfile(
+                id = "profile-1",
+                deviceId = "device-1",
+                token = "shared-token",
+                timestamp = 1000L
+            )
+        )
+
+        assertEquals(1, json.getInt("version"))
+        assertEquals("profile-1", json.getString("id"))
+        assertEquals("device-1", json.getString("deviceId"))
+        assertEquals(1000L, json.getLong("timestamp"))
+        assertEquals("pointer.profile", json.getString("type"))
+        assertEquals(0, json.getJSONObject("payload").length())
+        assertEquals("6g3iFCFoeVuM016G2evT0XlnNMgzqd3lflUYPNfHuI8", json.getString("auth"))
+        assertFalse(json.toString().contains("shared-token"))
+    }
+
+    @Test
+    fun parsesPointerProfileResponse() {
+        val response = PcProtocol.parseResponse(validPointerProfileResponse()) as PcProtocolResponse.PointerProfile
+
+        assertEquals("profile-1", response.id)
+        assertEquals("0:0:1280:720:1.5", response.profile.displayId)
+        assertEquals(1.5, response.profile.scaleFactor, 0.0)
+        assertEquals(1280, response.profile.bounds.width)
+        assertEquals(500, response.profile.maxDelta)
+        assertEquals(130, response.profile.recommendedDeltas.medium)
+    }
+
+    @Test
+    fun rejectsMalformedPointerProfileResponses() {
+        assertEquals(
+            PcProtocolResponse.Invalid,
+            PcProtocol.parseResponse(validPointerProfileResponse(displayId = ""))
+        )
+        assertEquals(
+            PcProtocolResponse.Invalid,
+            PcProtocol.parseResponse(validPointerProfileResponse(scaleFactor = 0.0))
+        )
+        assertEquals(
+            PcProtocolResponse.Invalid,
+            PcProtocol.parseResponse(validPointerProfileResponse(width = 0))
+        )
+        assertEquals(
+            PcProtocolResponse.Invalid,
+            PcProtocol.parseResponse(
+                """
+                {"version":1,"id":"profile-1","type":"pointer.profile","ok":true,"payload":{"displayId":"0:0:1280:720:1.5","scaleFactor":1.5,"bounds":{"x":0,"y":0,"width":1280,"height":720},"maxDelta":500},"error":null}
+                """.trimIndent()
+            )
+        )
+    }
+
     @Test
     fun buildsMouseMoveCommandWithAuthProof() {
         val json = JSONObject(
@@ -108,4 +165,14 @@ class PcProtocolTest {
         assertEquals("mouse.scroll", scroll.getString("type"))
         assertEquals(5, scroll.getJSONObject("payload").getInt("dy"))
     }
+
+    private fun validPointerProfileResponse(
+        displayId: String = "0:0:1280:720:1.5",
+        scaleFactor: Double = 1.5,
+        width: Int = 1280
+    ): String {
+        return """
+            {"version":1,"id":"profile-1","type":"pointer.profile","ok":true,"payload":{"displayId":"$displayId","scaleFactor":$scaleFactor,"bounds":{"x":0,"y":0,"width":$width,"height":720},"maxDelta":500,"recommendedDeltas":{"small":50,"medium":130,"large":252}},"error":null}
+        """.trimIndent()
+    }
 }
diff --git a/app/src/test/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGridTest.kt b/app/src/test/java/com/enaboapps/switchify/screens/pc/PcMouseCommandGridTest.kt
@@ -0,0 +1,29 @@
+package com.enaboapps.switchify.screens.pc
+
+import com.enaboapps.switchify.pc.PcMouseCommand
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class PcMouseCommandGridTest {
+    @Test
+    fun movementCommandsUseProvidedStep() {
+        val commands = pcMouseControlSpecs(130).map { it.command }
+
+        assertEquals(PcMouseCommand.Move(-130, -130), commands[0])
+        assertEquals(PcMouseCommand.Move(0, -130), commands[1])
+        assertEquals(PcMouseCommand.Move(130, -130), commands[2])
+        assertEquals(PcMouseCommand.Move(-130, 0), commands[3])
+        assertEquals(PcMouseCommand.Move(130, 0), commands[5])
+        assertEquals(PcMouseCommand.Move(-130, 130), commands[6])
+        assertEquals(PcMouseCommand.Move(0, 130), commands[7])
+        assertEquals(PcMouseCommand.Move(130, 130), commands[8])
+    }
+
+    @Test
+    fun scrollCommandsKeepExistingStep() {
+        val commands = pcMouseControlSpecs(130).map { it.command }
+
+        assertEquals(PcMouseCommand.Scroll(0, 5), commands[11])
+        assertEquals(PcMouseCommand.Scroll(0, -5), commands[12])
+    }
+}
diff --git a/app/src/test/java/com/enaboapps/switchify/screens/pc/PcMouseControlViewModelTest.kt b/app/src/test/java/com/enaboapps/switchify/screens/pc/PcMouseControlViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ private fun PcMouseControlScreen(`
`118`	`118`	`}`
`119`	`119`	`PcMouseCommandGrid(`
`120`	`120`	`connected = uiState.connectedDisplayName != null,`
	`121`	`+ movementStep = uiState.movementStep,`
`121`	`122`	`busyCommand = uiState.busyCommand,`
`122`	`123`	`onCommandSelected = viewModel::send`
`123`	`124`	`)`