From 10426cbe7864996f74be651e81d1b935f5898c37 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Fri, 13 Mar 2026 16:13:35 -0500 Subject: [PATCH] ProtobufBridge: Get rid of some unnecessary non-null assertions --- .../dev/slimevr/desktop/platform/ProtobufBridge.kt | 10 +++++----- .../slimevr/desktop/platform/linux/UnixSocketBridge.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt b/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt index fdbee0672..0d7eb5589 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/platform/ProtobufBridge.kt @@ -44,7 +44,7 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte protected abstract fun signalSend() @BridgeThread - protected abstract fun sendMessageReal(message: ProtobufMessage?): Boolean + protected abstract fun sendMessageReal(message: ProtobufMessage): Boolean private var remoteProtocolVersion: Int = 0 @@ -63,7 +63,7 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte protected fun updateMessageQueue() { var message: ProtobufMessage? while ((outputQueue.poll().also { message = it }) != null) { - if (!sendMessageReal(message)) return + if (!sendMessageReal(message!!)) return } } @@ -200,12 +200,12 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte } tracker = createNewTracker(trackerAdded) synchronized(remoteTrackersBySerial) { - remoteTrackersBySerial.put(tracker!!.name, tracker) + remoteTrackersBySerial.put(tracker.name, tracker) } synchronized(remoteTrackersByTrackerId) { - remoteTrackersByTrackerId.put(tracker!!.trackerNum, tracker) + remoteTrackersByTrackerId.put(tracker.trackerNum, tracker) } - instance.registerTracker(tracker!!) + instance.registerTracker(tracker) } @VRServerThread diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/platform/linux/UnixSocketBridge.kt b/server/desktop/src/main/java/dev/slimevr/desktop/platform/linux/UnixSocketBridge.kt index ccf26316f..e87479c26 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/platform/linux/UnixSocketBridge.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/platform/linux/UnixSocketBridge.kt @@ -112,10 +112,10 @@ class UnixSocketBridge( } @BridgeThread - override fun sendMessageReal(message: ProtobufMessage?): Boolean { + override fun sendMessageReal(message: ProtobufMessage): Boolean { channel?.let { channel -> try { - val size = message!!.getSerializedSize() + 4 + val size = message.getSerializedSize() + 4 src.putInt(size) val serialized = message.toByteArray() src.put(serialized)