fix(android): dedupe hello fields

This commit is contained in:
Peter Steinberger
2025-12-17 21:53:38 +01:00
parent 2b2376d4c0
commit d4b3d504e4
2 changed files with 20 additions and 26 deletions

View File

@@ -19,19 +19,16 @@ import java.net.Socket
class BridgePairingClient { class BridgePairingClient {
private val json = Json { ignoreUnknownKeys = true } private val json = Json { ignoreUnknownKeys = true }
data class Hello( data class Hello(
val nodeId: String, val nodeId: String,
val displayName: String?, val displayName: String?,
val token: String?, val token: String?,
val platform: String?, val platform: String?,
val version: String?, val version: String?,
val deviceFamily: String?, val deviceFamily: String?,
val modelIdentifier: String?, val modelIdentifier: String?,
val caps: List<String>?, val caps: List<String>?,
val deviceFamily: String?, )
val modelIdentifier: String?,
val caps: List<String>?,
)
data class PairResult(val ok: Boolean, val token: String?, val error: String? = null) data class PairResult(val ok: Boolean, val token: String?, val error: String? = null)

View File

@@ -34,19 +34,16 @@ class BridgeSession(
private val onEvent: (event: String, payloadJson: String?) -> Unit, private val onEvent: (event: String, payloadJson: String?) -> Unit,
private val onInvoke: suspend (InvokeRequest) -> InvokeResult, private val onInvoke: suspend (InvokeRequest) -> InvokeResult,
) { ) {
data class Hello( data class Hello(
val nodeId: String, val nodeId: String,
val displayName: String?, val displayName: String?,
val token: String?, val token: String?,
val platform: String?, val platform: String?,
val version: String?, val version: String?,
val deviceFamily: String?, val deviceFamily: String?,
val modelIdentifier: String?, val modelIdentifier: String?,
val caps: List<String>?, val caps: List<String>?,
val deviceFamily: String?, )
val modelIdentifier: String?,
val caps: List<String>?,
)
data class InvokeRequest(val id: String, val command: String, val paramsJson: String?) data class InvokeRequest(val id: String, val command: String, val paramsJson: String?)