diff --git a/server/core/src/main/java/dev/slimevr/solarxr/driver/handshake.kt b/server/core/src/main/java/dev/slimevr/solarxr/driver/handshake.kt index 15f9687ef..51ce5decd 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/driver/handshake.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/driver/handshake.kt @@ -37,7 +37,7 @@ class DriverHandshakeBehaviour( }.launchIn(receiver.context.scope) receiver.onDriverMessage { req, replyTo -> - val name = req.driverName?.takeIf { it.isNotEmpty() } ?: run { + val name = req.driverName.takeIf { it.isNotEmpty() } ?: run { AppLogger.solarxr.info("Rejecting driver handshake because it's unnamed") receiver.sendDriverMessage(HandshakeResponse(status = HandshakeStatus.REJECTED_UNNAMED), replyTo = replyTo) return@onDriverMessage diff --git a/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt b/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt index 4f7bea80e..6d3c22951 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt @@ -25,13 +25,11 @@ class DriverIncomingTrackersBehaviour( val server = appContext.server receiver.onDriverMessage { req, replyTo -> - val driverName = receiver.context.state.value.driverName - val hardwareId = req.hardwareIdentifier - - if (hardwareId == null || driverName == null) { + val driverName = receiver.context.state.value.driverName ?: run { receiver.sendDriverMessage(AddTrackerResponse(status = AddTrackerStatus.ERROR), replyTo = replyTo) return@onDriverMessage } + val hardwareId = req.hardwareIdentifier val existing = server.context.state.value.trackers.values .find { it.context.state.value.hardwareId == hardwareId } diff --git a/solarxr-protocol b/solarxr-protocol index 3286c1907..719bf90df 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit 3286c1907486f43bef17b04eb06215c038390c17 +Subproject commit 719bf90df607d72c4364006b0ce0394aa5037104