fix: address 2.8.0 release-audit findings (#6189)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Author: jamesarich

.skills/compose-ui/strings-index.txt

@@ -266,7 +266,7 @@ dependencies {
     implementation(libs.jetbrains.lifecycle.viewmodel.compose)
     implementation(libs.jetbrains.lifecycle.runtime.compose)
     implementation(libs.jetbrains.navigation3.ui)
-    implementation(libs.ktor.client.android)
+    implementation(libs.ktor.client.okhttp)
     implementation(libs.ktor.client.content.negotiation)
     implementation(libs.ktor.serialization.kotlinx.json)
     implementation(libs.ktor.client.logging)

androidApp/build.gradle.kts

@@ -32,7 +32,7 @@ import coil3.svg.SvgDecoder
 import coil3.util.DebugLogger
 import coil3.util.Logger
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.android.Android
+import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.DefaultRequest
 import io.ktor.client.plugins.HttpRequestRetry
 import io.ktor.client.plugins.HttpTimeout
@@ -95,9 +95,15 @@ class NetworkModule {
         .crossfade(enable = true)
         .build()
 
+    /**
+     * Uses the OkHttp engine, not `Android`. The `Android` engine is backed by [java.net.HttpURLConnection], which on
+     * device routes through the platform's bundled OkHttp 2.x fork (`com.android.okhttp`). Cancelling a request while
+     * its gzip/chunked response body is still being read trips a re-entrant `AsyncTimeout.enter()` in that fork and
+     * crashes with "Unbalanced enter/exit" (Crashlytics 97ae5ea1, 2.8.0 only). Square's OkHttp has no such bug.
+     */
     @Single
     fun provideHttpClient(json: Json, buildConfigProvider: BuildConfigProvider): HttpClient =
-        HttpClient(engineFactory = Android) {
+        HttpClient(engineFactory = OkHttp) {
             install(plugin = ContentNegotiation) { json(json) }
             install(DefaultRequest) { url(HttpClientDefaults.API_BASE_URL) }
             install(plugin = HttpTimeout) {

androidApp/src/main/kotlin/org/meshtastic/app/di/NetworkModule.kt

@@ -26,12 +26,13 @@ import co.touchlab.kermit.Logger
  * the first time a secondary transport learns a `myNodeNum` that another transport already claimed.
  *
  * Every per-device table is unified so switching transport is seamless: messages (+FTS), reactions, contact mute/read
- * settings, nodes and their notes, per-node metadata, the audit log (each session's received-packet history — the
- * source of the telemetry timelines, position history, and traceroute results the UI reconstructs), traceroute
- * positions, and discovery sessions. Where the same row exists on both sides the destination is preferred (it will be
- * refreshed by the same radio's re-dump on connect); source-only rows and strictly newer history are brought over.
- * Packets/reactions in [source] and [dest] already share the same `myNodeNum` (same node), so no key remapping is
- * needed there; autoincrement-keyed rows (packets, discovery) are re-inserted with fresh ids to avoid collisions.
+ * settings, nodes and their notes, per-node metadata, quick-chat actions, the audit log (each session's received-packet
+ * history — the source of the telemetry timelines, position history, and traceroute results the UI reconstructs),
+ * traceroute positions, and discovery sessions. Where the same row exists on both sides the destination is preferred
+ * (it will be refreshed by the same radio's re-dump on connect); source-only rows and strictly newer history are
+ * brought over. Packets/reactions in [source] and [dest] already share the same `myNodeNum` (same node), so no key
+ * remapping is needed there; autoincrement-keyed rows (packets, discovery) are re-inserted with fresh ids to avoid
+ * collisions.
  */
 object DatabaseMerger {
 
@@ -49,6 +50,7 @@ object DatabaseMerger {
                 mergeContactSettings(source, dest)
                 mergeNodes(source, dest)
                 mergeMetadata(source, dest)
+                mergeQuickChat(source, dest)
                 // Logs must precede traceroute positions: the latter has a CASCADE foreign key onto log.uuid.
                 mergeLogs(source, dest)
                 mergeTraceroutePositions(source, dest)
@@ -110,6 +112,23 @@ object DatabaseMerger {
         }
     }
 
+    /**
+     * User-authored quick-chat buttons. `uuid`/`position` are per-DB, so append the source's actions after the
+     * destination's last one with fresh ids, skipping any the destination already has (same name + message + mode).
+     * Without this the source's buttons are lost outright when [DatabaseManager] retires it.
+     */
+    private suspend fun mergeQuickChat(source: MeshtasticDatabase, dest: MeshtasticDatabase) {
+        val destActions = dest.quickChatActionDao().getAllSnapshot()
+        val existing = destActions.mapTo(mutableSetOf()) { Triple(it.name, it.message, it.mode) }
+        var nextPosition = (destActions.maxOfOrNull { it.position } ?: -1) + 1
+        source.quickChatActionDao().getAllSnapshot().forEach { action ->
+            if (existing.add(Triple(action.name, action.message, action.mode))) {
+                dest.quickChatActionDao().upsert(action.copy(uuid = 0L, position = nextPosition))
+                nextPosition++
+            }
+        }
+    }
+
     /**
      * The audit log holds each transport session's received-packet history — the source of the telemetry timelines,
      * position history, and node-info history the UI reconstructs per node/port. This is the only place that time

core/database/src/commonMain/kotlin/org/meshtastic/core/database/DatabaseMerger.kt

@@ -29,6 +29,10 @@ interface QuickChatActionDao {
     @Query("Select * from quick_chat order by position asc")
     fun getAll(): Flow<List<QuickChatAction>>
 
+    /** Snapshot used by DatabaseMerger to fold one transport's DB into another for the same node. */
+    @Query("Select * from quick_chat order by position asc")
+    suspend fun getAllSnapshot(): List<QuickChatAction>
+
     @Upsert suspend fun upsert(action: QuickChatAction)
 
     @Query("Delete from quick_chat")

core/database/src/commonMain/kotlin/org/meshtastic/core/database/dao/QuickChatActionDao.kt

@@ -42,11 +42,15 @@ abstract class BaseRadioTransportFactory(
             InterfaceId.TCP.id,
             InterfaceId.SERIAL.id,
             InterfaceId.BLUETOOTH.id,
-            InterfaceId.MOCK.id,
-            InterfaceId.REPLAY.id,
             '!',
             -> true
 
+            // Virtual transports are development aids. A release build must never bind one: `connections?address=m` is
+            // reachable from any web page through the verified meshtastic.org app link.
+            InterfaceId.MOCK.id,
+            InterfaceId.REPLAY.id,
+            -> isMockTransport()
+
             else -> isPlatformAddressValid(address)
         }
     }

core/network/src/commonMain/kotlin/org/meshtastic/core/network/radio/BaseRadioTransportFactory.kt

@@ -333,6 +333,10 @@
     <string name="debug_store_logs_title">Store mesh logs</string>
     <string name="debug_tab_app_logs">App logs</string>
     <string name="debug_tab_packets">Packets</string>
+    <string name="deep_link_connect_message">A link is asking this app to connect to the device at %1$s. Only continue if you trust where the link came from.</string>
+    <string name="deep_link_connect_title">Connect to this device?</string>
+    <string name="deep_link_disconnect_message">A link is asking this app to disconnect from your device. Only continue if you trust where the link came from.</string>
+    <string name="deep_link_disconnect_title">Disconnect from your device?</string>
     <string name="default_">Default</string>
     <string name="default_mqtt_address" translatable="false">mqtt.meshtastic.org</string>
     <!-- DELETE -->

core/resources/src/commonMain/composeResources/values/strings.xml

@@ -395,10 +395,14 @@ actual fun rememberLocationPermissionState(): PermissionUiState = rememberRuntim
 @Composable
 actual fun rememberBluetoothPermissionState(): PermissionUiState {
     if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S) {
-        // Pre-Android 12 has no runtime Bluetooth permission — BLE scanning is gated by the location permission, which
-        // callers request separately (the intro Location screen, the map/Privacy location flows). Report granted here
-        // so the Bluetooth surface itself is a no-op rather than masquerading as a location request.
-        return rememberGrantedPermissionState()
+        // Pre-Android 12 has no runtime Bluetooth permission — the platform gates BLE scanning on fine location
+        // instead. Reporting "granted" here left a user who declined location with an empty device list and no way to
+        // re-prompt, so surface the permission that actually blocks the scan. Fine specifically: API 29/30 return zero
+        // scan results on a coarse-only grant.
+        return rememberRuntimePermissionState(
+            permissions = arrayOf(android.Manifest.permission.ACCESS_FINE_LOCATION),
+            requireAll = true,
+        )
     }
     return rememberRuntimePermissionState(
         permissions =

core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt

@@ -361,14 +361,14 @@ private fun gatherSensors(node: Node, tempInFahrenheit: Boolean, contentColor: C
         items.add { PaxcountInfo(pax = "B:${pax.ble} W:${pax.wifi}", contentColor = contentColor) }
     }
 
-    if ((env.temperature ?: 0f) != 0f) {
-        val temp = MetricFormatter.temperature(env.temperature ?: 0f, tempInFahrenheit)
-        items.add { TemperatureInfo(temp = temp, contentColor = contentColor) }
-    } else if ((aq.co2_temperature ?: 0f) != 0f) {
-        val temp = MetricFormatter.temperature(aq.co2_temperature ?: 0f, tempInFahrenheit)
+    // Temperature carries presence, so `null` already means "no sensor" — testing against 0 hid an ordinary 0 °C
+    // reading, which the temperature chart plots. Prefer the environment sensor, then the SCD4x CO₂ sensor's own.
+    (env.temperature ?: aq.co2_temperature)?.let { temperature ->
+        val temp = MetricFormatter.temperature(temperature, tempInFahrenheit)
         items.add { TemperatureInfo(temp = temp, contentColor = contentColor) }
     }
 
+    // Humidity keeps its zero-guard: 0% RH is not physically reachable, and the humidity chart filters it too.
     if ((env.relative_humidity ?: 0f) != 0f) {
         items.add {
             HumidityInfo(humidity = MetricFormatter.humidity(env.relative_humidity ?: 0f), contentColor = contentColor)

core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/NodeItem.kt

@@ -52,6 +52,9 @@ internal fun processTcpServices(
             }
             DeviceListEntry.Tcp(displayName, address)
         }
+        // mDNS can resolve two services to one host:port (e.g. re-announce before the old record expires). The device
+        // list keys on fullAddress, and duplicate LazyColumn keys are a hard crash.
+        .distinctBy { it.fullAddress }
         .sortedBy { it.name }
 }