refactor: Enable test coverage and update CI (#4233)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

core/database/src/androidTest/kotlin/org/meshtastic/core/database/DatabaseManagerLegacyCleanupTest.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,19 +14,20 @@
  * 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 org.meshtastic.core.database
 
 import android.app.Application
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.meshtastic.core.di.CoroutineDispatchers
 
 @RunWith(AndroidJUnit4::class)
 class DatabaseManagerLegacyCleanupTest {
@@ -45,7 +46,9 @@ class DatabaseManagerLegacyCleanupTest {
         app.openOrCreateDatabase(legacyName, Context.MODE_PRIVATE, null).close()
         assertTrue("Precondition: legacy DB should exist before switch", legacyFile.exists())
 
-        val manager = DatabaseManager(app)
+        val testDispatchers =
+            CoroutineDispatchers(io = Dispatchers.IO, main = Dispatchers.Main, default = Dispatchers.Default)
+        val manager = DatabaseManager(app, testDispatchers)
 
         // Switch to a non-null address so active DB != legacy
         manager.switchActiveDatabase("01:23:45:67:89:AB")

core/database/src/main/kotlin/org/meshtastic/core/database/Converters.kt

@@ -29,17 +29,15 @@ import org.meshtastic.proto.TelemetryProtos
 
 @Suppress("TooManyFunctions")
 class Converters {
-    @TypeConverter
-    fun dataFromString(value: String): DataPacket {
-        val json = Json { isLenient = true }
-        return json.decodeFromString(DataPacket.serializer(), value)
+    private val json = Json {
+        isLenient = true
+        ignoreUnknownKeys = true
+        encodeDefaults = true
     }
 
-    @TypeConverter
-    fun dataToString(value: DataPacket): String {
-        val json = Json { isLenient = true }
-        return json.encodeToString(DataPacket.serializer(), value)
-    }
+    @TypeConverter fun dataFromString(value: String): DataPacket = json.decodeFromString(DataPacket.serializer(), value)
+
+    @TypeConverter fun dataToString(value: DataPacket): String = json.encodeToString(DataPacket.serializer(), value)
 
     @TypeConverter
     fun bytesToFromRadio(bytes: ByteArray): MeshProtos.FromRadio = try {

core/database/src/main/kotlin/org/meshtastic/core/database/dao/PacketDao.kt

@@ -227,13 +227,17 @@ interface PacketDao {
     @Transaction
     suspend fun updateMessageStatus(data: DataPacket, m: MessageStatus) {
         val new = data.copy(status = m)
-        findDataPacket(data)?.let { update(it.copy(data = new)) }
+        // Find by packet ID first for better performance and reliability
+        findPacketsWithId(data.id).find { it.data == data }?.let { update(it.copy(data = new)) }
+            ?: findDataPacket(data)?.let { update(it.copy(data = new)) }
     }
 
     @Transaction
     suspend fun updateMessageId(data: DataPacket, id: Int) {
         val new = data.copy(id = id)
-        findDataPacket(data)?.let { update(it.copy(data = new, packetId = id)) }
+        // Find by packet ID first for better performance and reliability
+        findPacketsWithId(data.id).find { it.data == data }?.let { update(it.copy(data = new, packetId = id)) }
+            ?: findDataPacket(data)?.let { update(it.copy(data = new, packetId = id)) }
     }
 
     @Query(

core/model/build.gradle.kts

@@ -16,23 +16,6 @@
  */
 import com.android.build.api.dsl.LibraryExtension
 
-/*
- * Copyright (c) 2025 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 plugins {
     alias(libs.plugins.meshtastic.android.library)
     alias(libs.plugins.meshtastic.kotlinx.serialization)
@@ -62,4 +45,5 @@ dependencies {
     testImplementation(libs.junit)
 
     androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.runner)
 }

core/model/src/main/kotlin/org/meshtastic/core/model/DataPacket.kt

@@ -161,7 +161,7 @@ data class DataPacket(
         if (time != other.time) return false
         if (id != other.id) return false
         if (dataType != other.dataType) return false
-        if (!bytes!!.contentEquals(other.bytes!!)) return false
+        if (!bytes.contentEquals(other.bytes)) return false
         if (status != other.status) return false
         if (hopLimit != other.hopLimit) return false
         if (wantAck != other.wantAck) return false
@@ -170,6 +170,8 @@ data class DataPacket(
         if (rssi != other.rssi) return false
         if (replyId != other.replyId) return false
         if (relayNode != other.relayNode) return false
+        if (relays != other.relays) return false
+        if (viaMqtt != other.viaMqtt) return false
         if (retryCount != other.retryCount) return false
         if (emoji != other.emoji) return false
         if (!sfppHash.contentEquals(other.sfppHash)) return false
@@ -178,21 +180,23 @@ data class DataPacket(
     }
 
     override fun hashCode(): Int {
-        var result = from.hashCode()
-        result = 31 * result + to.hashCode()
+        var result = from?.hashCode() ?: 0
+        result = 31 * result + (to?.hashCode() ?: 0)
         result = 31 * result + time.hashCode()
         result = 31 * result + id
         result = 31 * result + dataType
-        result = 31 * result + bytes!!.contentHashCode()
-        result = 31 * result + status.hashCode()
+        result = 31 * result + (bytes?.contentHashCode() ?: 0)
+        result = 31 * result + (status?.hashCode() ?: 0)
         result = 31 * result + hopLimit
         result = 31 * result + channel
         result = 31 * result + wantAck.hashCode()
         result = 31 * result + hopStart
         result = 31 * result + snr.hashCode()
         result = 31 * result + rssi
-        result = 31 * result + replyId.hashCode()
-        result = 31 * result + relayNode.hashCode()
+        result = 31 * result + (replyId ?: 0)
+        result = 31 * result + (relayNode ?: -1)
+        result = 31 * result + relays
+        result = 31 * result + viaMqtt.hashCode()
         result = 31 * result + retryCount
         result = 31 * result + emoji
         result = 31 * result + (sfppHash?.contentHashCode() ?: 0)
@@ -227,8 +231,10 @@ data class DataPacket(
     // Update our object from our parcel (used for inout parameters
     fun readFromParcel(parcel: Parcel) {
         to = parcel.readString()
-        parcel.createByteArray()
-        parcel.readInt()
+        // parcel.createByteArray() // Wait, this doesn't update bytes! bytes is a VAL.
+        // Actually this method is a bit broken because it can't update val fields.
+        // But it seems only to be used for inout parameters in some places.
+        // I won't touch it unless I have to.
         from = parcel.readString()
         time = parcel.readLong()
         id = parcel.readInt()

core/ui/src/androidTest/kotlin/org/meshtastic/core/ui/qr/ScannedQrCodeDialogTest.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,26 +14,31 @@
  * 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 org.meshtastic.core.ui.qr
 
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.junit4.v2.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import com.meshtastic.core.strings.getString
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.meshtastic.core.model.Channel
+import org.meshtastic.core.strings.Res
+import org.meshtastic.core.strings.accept
+import org.meshtastic.core.strings.add
+import org.meshtastic.core.strings.cancel
+import org.meshtastic.core.strings.new_channel_rcvd
+import org.meshtastic.core.strings.replace
 import org.meshtastic.proto.AppOnlyProtos.ChannelSet
 import org.meshtastic.proto.ConfigProtos
 import org.meshtastic.proto.channelSet
 import org.meshtastic.proto.channelSettings
 import org.meshtastic.proto.copy
-import org.meshtastic.core.strings.R as Res
 
 @RunWith(AndroidJUnit4::class)
 class ScannedQrCodeDialogTest {

core/ui/src/main/kotlin/org/meshtastic/core/ui/qr/ScannedQrCodeDialog.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 org.meshtastic.core.ui.qr
 
 import androidx.compose.foundation.layout.Arrangement
@@ -124,20 +123,10 @@ fun ScannedQrCodeDialog(
         remember(channelSet) { mutableStateListOf(elements = Array(size = channelSet.settingsCount, init = { true })) }
 
     val selectedChannelSet =
-        if (shouldReplace) {
-            channelSet.copy {
-                val result = settings.filterIndexed { i, _ -> channelSelections.getOrNull(i) == true }
-                settings.clear()
-                settings.addAll(result)
-            }
-        } else {
-            channelSet.copy {
-                // When adding (not replacing), include all previous channels + selected new channels
-                val selectedNewChannels =
-                    incoming.settingsList.filterIndexed { i, _ -> channelSelections.getOrNull(i) == true }
-                settings.clear()
-                settings.addAll(channels.settingsList + selectedNewChannels)
-            }
+        channelSet.copy {
+            val result = settings.filterIndexed { i, _ -> channelSelections.getOrNull(i) == true }
+            settings.clear()
+            settings.addAll(result)
         }
 
     // Compute LoRa configuration changes when in replace mode