refactor: Migrate from Protobuf-Java to Wire

app/build.gradle.kts

@@ -248,6 +248,7 @@ dependencies {
 
     testImplementation(libs.junit)
     testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockk)
 }
 
 aboutLibraries {

app/detekt-baseline.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='UTF-8'?>
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>CommentSpacing:BLEException.kt$BLEConnectionClosing$/// Our interface is being shut down</ID>
-    <ID>CommentSpacing:Constants.kt$/// a bool true means we expect this condition to continue until, false means device might come back</ID>
     <ID>CommentSpacing:Coroutines.kt$/// Wrap launch with an exception handler, FIXME, move into a utility lib</ID>
     <ID>CyclomaticComplexMethod:BleError.kt$BleError.Companion$fun from(exception: Throwable): BleError</ID>
-    <ID>CyclomaticComplexMethod:MeshService.kt$MeshService$private fun handleReceivedData(packet: MeshPacket)</ID>
+    <ID>CyclomaticComplexMethod:MeshDataHandler.kt$MeshDataHandler$@Suppress("LongMethod") private fun handleStoreForwardPlusPlus(packet: MeshPacket)</ID>
+    <ID>CyclomaticComplexMethod:MeshDataHandler.kt$MeshDataHandler$private fun handleTelemetry(packet: MeshPacket, dataPacket: DataPacket, myNodeNum: Int)</ID>
+    <ID>CyclomaticComplexMethod:MeshDataHandler.kt$MeshDataHandler$private fun rememberReaction(packet: MeshPacket)</ID>
+    <ID>CyclomaticComplexMethod:MeshMessageProcessor.kt$MeshMessageProcessor$private fun processReceivedMeshPacket(packet: MeshPacket, myNodeNum: Int?)</ID>
     <ID>CyclomaticComplexMethod:SettingsNavigation.kt$@Suppress("LongMethod") fun NavGraphBuilder.settingsGraph(navController: NavHostController)</ID>
     <ID>EmptyClassBlock:DebugLogFile.kt$BinaryLogFile${ }</ID>
     <ID>EmptyFunctionBlock:NopInterface.kt$NopInterface${ }</ID>
     <ID>EmptyFunctionBlock:TrustAllX509TrustManager.kt$TrustAllX509TrustManager${}</ID>
-    <ID>FinalNewline:BLEException.kt$com.geeksville.mesh.service.BLEException.kt</ID>
     <ID>FinalNewline:Coroutines.kt$com.geeksville.mesh.concurrent.Coroutines.kt</ID>
     <ID>FinalNewline:DateUtils.kt$com.geeksville.mesh.android.DateUtils.kt</ID>
     <ID>FinalNewline:DebugLogFile.kt$com.geeksville.mesh.android.DebugLogFile.kt</ID>
@@ -21,27 +21,15 @@
     <ID>FinalNewline:NopInterface.kt$com.geeksville.mesh.repository.radio.NopInterface.kt</ID>
     <ID>FinalNewline:NopInterfaceFactory.kt$com.geeksville.mesh.repository.radio.NopInterfaceFactory.kt</ID>
     <ID>FinalNewline:ProbeTableProvider.kt$com.geeksville.mesh.repository.usb.ProbeTableProvider.kt</ID>
-    <ID>FinalNewline:RadioNotConnectedException.kt$com.geeksville.mesh.service.RadioNotConnectedException.kt</ID>
     <ID>FinalNewline:SerialConnection.kt$com.geeksville.mesh.repository.usb.SerialConnection.kt</ID>
     <ID>FinalNewline:SerialConnectionListener.kt$com.geeksville.mesh.repository.usb.SerialConnectionListener.kt</ID>
     <ID>FinalNewline:SerialInterfaceFactory.kt$com.geeksville.mesh.repository.radio.SerialInterfaceFactory.kt</ID>
     <ID>FinalNewline:TCPInterfaceFactory.kt$com.geeksville.mesh.repository.radio.TCPInterfaceFactory.kt</ID>
     <ID>FinalNewline:UsbRepositoryModule.kt$com.geeksville.mesh.repository.usb.UsbRepositoryModule.kt</ID>
-    <ID>LargeClass:MeshService.kt$MeshService : Service</ID>
-    <ID>LongMethod:MeshService.kt$MeshService$private fun handleReceivedData(packet: MeshPacket)</ID>
     <ID>LongMethod:TCPInterface.kt$TCPInterface$private suspend fun startConnect()</ID>
     <ID>MagicNumber:Contacts.kt$7</ID>
     <ID>MagicNumber:Contacts.kt$8</ID>
     <ID>MagicNumber:MQTTRepository.kt$MQTTRepository$512</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$0xffffffff</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$1000</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$1000.0</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$1000L</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$16</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$30</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$32</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$60000</ID>
-    <ID>MagicNumber:MeshService.kt$MeshService$8</ID>
     <ID>MagicNumber:ProbeTableProvider.kt$ProbeTableProvider$21972</ID>
     <ID>MagicNumber:ProbeTableProvider.kt$ProbeTableProvider$32809</ID>
     <ID>MagicNumber:ProbeTableProvider.kt$ProbeTableProvider$6790</ID>
@@ -55,17 +43,10 @@
     <ID>MagicNumber:StreamInterface.kt$StreamInterface$8</ID>
     <ID>MagicNumber:TCPInterface.kt$TCPInterface$1000</ID>
     <ID>MagicNumber:UIState.kt$4</ID>
-    <ID>MaxLineLength:MeshService.kt$MeshService$"Config complete id mismatch: received=$configCompleteId expected one of [$configOnlyNonce,$nodeInfoNonce]"</ID>
-    <ID>MaxLineLength:MeshService.kt$MeshService$"Neighbor info response filtered: ToUs=$isAddressedToUs, isRecentRequest=$isRecentRequest"</ID>
-    <ID>MaxLineLength:MeshService.kt$MeshService$"setOwner Id: $id longName: ${longName.anonymize} shortName: $shortName isLicensed: $isLicensed isUnmessagable: $isUnmessagable"</ID>
-    <ID>MaxLineLength:MeshService.kt$MeshService.&lt;no name provided&gt;$"sendData dest=${p.to}, id=${p.id} &lt;- ${bytes.size} bytes (connectionState=${connectionStateHolder.connectionState.value})"</ID>
     <ID>MaxLineLength:NordicBleInterface.kt$NordicBleInterface$"[$address] Found fromNum: ${fromNumCharacteristic?.uuid}, ${fromNumCharacteristic?.instanceId}"</ID>
     <ID>MaxLineLength:NordicBleInterface.kt$NordicBleInterface$"[$address] Found fromRadio: ${fromRadioCharacteristic?.uuid}, ${fromRadioCharacteristic?.instanceId}"</ID>
     <ID>MaxLineLength:NordicBleInterface.kt$NordicBleInterface$"[$address] Found logRadio: ${logRadioCharacteristic?.uuid}, ${logRadioCharacteristic?.instanceId}"</ID>
     <ID>MaxLineLength:NordicBleInterface.kt$NordicBleInterface$"[$address] Found toRadio: ${toRadioCharacteristic?.uuid}, ${toRadioCharacteristic?.instanceId}"</ID>
-    <ID>NestedBlockDepth:MeshService.kt$MeshService$private fun handleReceivedAdmin(fromNodeNum: Int, a: AdminProtos.AdminMessage)</ID>
-    <ID>NestedBlockDepth:MeshService.kt$MeshService$private fun handleReceivedData(packet: MeshPacket)</ID>
-    <ID>NewLineAtEndOfFile:BLEException.kt$com.geeksville.mesh.service.BLEException.kt</ID>
     <ID>NewLineAtEndOfFile:Coroutines.kt$com.geeksville.mesh.concurrent.Coroutines.kt</ID>
     <ID>NewLineAtEndOfFile:DateUtils.kt$com.geeksville.mesh.android.DateUtils.kt</ID>
     <ID>NewLineAtEndOfFile:DebugLogFile.kt$com.geeksville.mesh.android.DebugLogFile.kt</ID>
@@ -75,45 +56,46 @@
     <ID>NewLineAtEndOfFile:NopInterface.kt$com.geeksville.mesh.repository.radio.NopInterface.kt</ID>
     <ID>NewLineAtEndOfFile:NopInterfaceFactory.kt$com.geeksville.mesh.repository.radio.NopInterfaceFactory.kt</ID>
     <ID>NewLineAtEndOfFile:ProbeTableProvider.kt$com.geeksville.mesh.repository.usb.ProbeTableProvider.kt</ID>
-    <ID>NewLineAtEndOfFile:RadioNotConnectedException.kt$com.geeksville.mesh.service.RadioNotConnectedException.kt</ID>
     <ID>NewLineAtEndOfFile:SerialConnection.kt$com.geeksville.mesh.repository.usb.SerialConnection.kt</ID>
     <ID>NewLineAtEndOfFile:SerialConnectionListener.kt$com.geeksville.mesh.repository.usb.SerialConnectionListener.kt</ID>
     <ID>NewLineAtEndOfFile:SerialInterfaceFactory.kt$com.geeksville.mesh.repository.radio.SerialInterfaceFactory.kt</ID>
     <ID>NewLineAtEndOfFile:TCPInterfaceFactory.kt$com.geeksville.mesh.repository.radio.TCPInterfaceFactory.kt</ID>
     <ID>NewLineAtEndOfFile:UsbRepositoryModule.kt$com.geeksville.mesh.repository.usb.UsbRepositoryModule.kt</ID>
     <ID>NoBlankLineBeforeRbrace:DebugLogFile.kt$BinaryLogFile$ </ID>
     <ID>NoBlankLineBeforeRbrace:NopInterface.kt$NopInterface$ </ID>
-    <ID>NoConsecutiveBlankLines:Constants.kt$ </ID>
     <ID>NoConsecutiveBlankLines:DebugLogFile.kt$ </ID>
     <ID>NoEmptyClassBody:DebugLogFile.kt$BinaryLogFile${ }</ID>
     <ID>NoSemicolons:DateUtils.kt$DateUtils$;</ID>
     <ID>OptionalAbstractKeyword:SyncContinuation.kt$Continuation$abstract</ID>
     <ID>RethrowCaughtException:SyncContinuation.kt$Continuation$throw ex</ID>
+    <ID>ReturnCount:MeshDataHandler.kt$MeshDataHandler$private fun shouldBatteryNotificationShow(fromNum: Int, t: Telemetry, myNodeNum: Int): Boolean</ID>
+    <ID>SpreadOperator:Channel.kt$(*Array(size = 8, init = { true }))</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$( *(AdminMessage().initFn().copy(session_passkey = sessionPasskey.get()).encode()), )</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*meshPosition.encode())</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*myNode.user.encode())</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*neighborInfoToSend.encode())</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*p.bytes ?: ByteArray(0))</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*pos.encode())</ID>
+    <ID>SpreadOperator:MeshCommandSender.kt$MeshCommandSender$(*telemetryRequest.encode())</ID>
     <ID>SwallowedException:Exceptions.kt$ex: Throwable</ID>
     <ID>SwallowedException:NsdManager.kt$ex: IllegalArgumentException</ID>
     <ID>SwallowedException:ServiceClient.kt$ServiceClient$ex: IllegalArgumentException</ID>
     <ID>SwallowedException:TCPInterface.kt$TCPInterface$ex: SocketTimeoutException</ID>
     <ID>TooGenericExceptionCaught:Exceptions.kt$ex: Throwable</ID>
     <ID>TooGenericExceptionCaught:MQTTRepository.kt$MQTTRepository$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:MeshService.kt$MeshService$ex: Exception</ID>
-    <ID>TooGenericExceptionCaught:MeshService.kt$MeshService.&lt;no name provided&gt;$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:NordicBleInterface.kt$NordicBleInterface$e: Exception</ID>
     <ID>TooGenericExceptionCaught:NordicBleInterface.kt$NordicBleInterface$t: Throwable</ID>
     <ID>TooGenericExceptionCaught:RadioInterfaceService.kt$RadioInterfaceService$t: Throwable</ID>
     <ID>TooGenericExceptionCaught:SyncContinuation.kt$Continuation$ex: Throwable</ID>
     <ID>TooGenericExceptionCaught:TCPInterface.kt$TCPInterface$ex: Throwable</ID>
-    <ID>TooGenericExceptionThrown:MeshService.kt$MeshService$throw Exception("Can't set user without a NodeInfo")</ID>
-    <ID>TooGenericExceptionThrown:MeshService.kt$MeshService.&lt;no name provided&gt;$throw Exception("Port numbers must be non-zero!")</ID>
     <ID>TooGenericExceptionThrown:ServiceClient.kt$ServiceClient$throw Exception("Haven't called connect")</ID>
     <ID>TooGenericExceptionThrown:ServiceClient.kt$ServiceClient$throw Exception("Service not bound")</ID>
     <ID>TooGenericExceptionThrown:SyncContinuation.kt$SyncContinuation$throw Exception("SyncContinuation timeout")</ID>
     <ID>TooGenericExceptionThrown:SyncContinuation.kt$SyncContinuation$throw Exception("This shouldn't happen")</ID>
-    <ID>TooManyFunctions:MeshService.kt$MeshService : Service</ID>
-    <ID>TooManyFunctions:MeshService.kt$MeshService$&lt;no name provided&gt; : Stub</ID>
     <ID>TooManyFunctions:NordicBleInterface.kt$NordicBleInterface : IRadioInterface</ID>
     <ID>TooManyFunctions:RadioInterfaceService.kt$RadioInterfaceService</ID>
     <ID>TooManyFunctions:UIState.kt$UIViewModel : ViewModel</ID>
-    <ID>TopLevelPropertyNaming:Constants.kt$const val prefix = "com.geeksville.mesh"</ID>
     <ID>UtilityClassWithPublicConstructor:NetworkRepositoryModule.kt$NetworkRepositoryModule</ID>
   </CurrentIssues>
 </SmellBaseline>

app/proguard-rules.pro

@@ -21,7 +21,6 @@
 #-renamesourcefileattribute SourceFile
 
 # Needed for protobufs
--keep class com.google.protobuf.** { *; }
 -keep class org.meshtastic.proto.** { *; }
 
 # eclipse.paho.client

app/src/main/java/com/geeksville/mesh/model/UIState.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Meshtastic LLC
+ * Copyright (c) 2025-2026 Meshtastic LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
 package com.geeksville.mesh.model
 
 import android.app.Application
@@ -65,9 +64,9 @@ import org.meshtastic.core.strings.client_notification
 import org.meshtastic.core.ui.component.ScrollToTopEvent
 import org.meshtastic.core.ui.component.toSharedContact
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
-import org.meshtastic.proto.AdminProtos
-import org.meshtastic.proto.AppOnlyProtos
-import org.meshtastic.proto.MeshProtos
+import org.meshtastic.proto.ChannelSet
+import org.meshtastic.proto.ClientNotification
+import org.meshtastic.proto.SharedContact
 import javax.inject.Inject
 
 // Given a human name, strip out the first letter of the first three words and return that as the
@@ -119,11 +118,11 @@ constructor(
 
     val theme: StateFlow<Int> = uiPreferencesDataSource.theme
 
-    val firmwareEdition = meshLogRepository.getMyNodeInfo().map { nodeInfo -> nodeInfo?.firmwareEdition }
+    val firmwareEdition = meshLogRepository.getMyNodeInfo().map { nodeInfo -> nodeInfo?.firmware_edition }
 
-    val clientNotification: StateFlow<MeshProtos.ClientNotification?> = serviceRepository.clientNotification
+    val clientNotification: StateFlow<ClientNotification?> = serviceRepository.clientNotification
 
-    fun clearClientNotification(notification: MeshProtos.ClientNotification) {
+    fun clearClientNotification(notification: ClientNotification) {
         serviceRepository.clearClientNotification()
         meshServiceNotifications.clearClientNotification(notification)
     }
@@ -215,8 +214,8 @@ constructor(
         Logger.d { "ViewModel created" }
     }
 
-    private val _sharedContactRequested: MutableStateFlow<AdminProtos.SharedContact?> = MutableStateFlow(null)
-    val sharedContactRequested: StateFlow<AdminProtos.SharedContact?>
+    private val _sharedContactRequested: MutableStateFlow<SharedContact?> = MutableStateFlow(null)
+    val sharedContactRequested: StateFlow<SharedContact?>
         get() = _sharedContactRequested.asStateFlow()
 
     fun setSharedContactRequested(url: Uri, onFailure: () -> Unit) {
@@ -236,8 +235,8 @@ constructor(
     val connectionState
         get() = serviceRepository.connectionState
 
-    private val _requestChannelSet = MutableStateFlow<AppOnlyProtos.ChannelSet?>(null)
-    val requestChannelSet: StateFlow<AppOnlyProtos.ChannelSet?>
+    private val _requestChannelSet = MutableStateFlow<ChannelSet?>(null)
+    val requestChannelSet: StateFlow<ChannelSet?>
         get() = _requestChannelSet
 
     fun requestChannelUrl(url: Uri, onFailure: () -> Unit) =

app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Meshtastic LLC
+ * Copyright (c) 2025-2026 Meshtastic LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,16 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
 package com.geeksville.mesh.repository.network
 
 import co.touchlab.kermit.Logger
 import com.geeksville.mesh.util.ignoreException
-import com.google.protobuf.ByteString
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.first
+import okio.ByteString.Companion.toByteString
 import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient
@@ -35,8 +34,7 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence
 import org.meshtastic.core.data.repository.NodeRepository
 import org.meshtastic.core.data.repository.RadioConfigRepository
 import org.meshtastic.core.model.util.subscribeList
-import org.meshtastic.proto.MeshProtos.MqttClientProxyMessage
-import org.meshtastic.proto.mqttClientProxyMessage
+import org.meshtastic.proto.MqttClientProxyMessage
 import java.net.URI
 import java.security.SecureRandom
 import javax.inject.Inject
@@ -81,7 +79,8 @@ constructor(
     val proxyMessageFlow: Flow<MqttClientProxyMessage> = callbackFlow {
         val ownerId = "MeshtasticAndroidMqttProxy-${nodeRepository.myId.value ?: generateClientId()}"
         val channelSet = radioConfigRepository.channelSetFlow.first()
-        val mqttConfig = radioConfigRepository.moduleConfigFlow.first().mqtt
+        val mqttConfig =
+            radioConfigRepository.moduleConfigFlow.first().mqtt ?: org.meshtastic.proto.ModuleConfig.MQTTConfig()
 
         val sslContext = SSLContext.getInstance("TLS")
         // Create a custom SSLContext that trusts all certificates
@@ -94,7 +93,7 @@ constructor(
                 userName = mqttConfig.username
                 password = mqttConfig.password.toCharArray()
                 isAutomaticReconnect = true
-                if (mqttConfig.tlsEnabled) {
+                if (mqttConfig.tls_enabled == true) {
                     socketFactory = sslContext.socketFactory
                 }
             }
@@ -117,7 +116,7 @@ constructor(
                         }
                         .forEach { globalId ->
                             subscribe("$rootTopic$DEFAULT_TOPIC_LEVEL$globalId/+")
-                            if (mqttConfig.jsonEnabled) subscribe("$rootTopic$JSON_TOPIC_LEVEL$globalId/+")
+                            if (mqttConfig.json_enabled == true) subscribe("$rootTopic$JSON_TOPIC_LEVEL$globalId/+")
                         }
                     subscribe("$rootTopic${DEFAULT_TOPIC_LEVEL}PKI/+")
                 }
@@ -129,11 +128,11 @@ constructor(
 
                 override fun messageArrived(topic: String, message: MqttMessage) {
                     trySend(
-                        mqttClientProxyMessage {
-                            this.topic = topic
-                            data = ByteString.copyFrom(message.payload)
-                            retained = message.isRetained
-                        },
+                        MqttClientProxyMessage(
+                            topic = topic,
+                            data_ = message.payload.toByteString(),
+                            retained = message.isRetained,
+                        ),
                     )
                 }
 
@@ -142,7 +141,7 @@ constructor(
                 }
             }
 
-        val scheme = if (mqttConfig.tlsEnabled) "ssl" else "tcp"
+        val scheme = if (mqttConfig.tls_enabled == true) "ssl" else "tcp"
         val (host, port) =
             mqttConfig.address
                 .ifEmpty { DEFAULT_SERVER_ADDRESS }