chore: review-cleanup fleet (audit + fix + hardening) (#5158)

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/TrustAllX509TrustManager.kt

@@ -1,31 +0,0 @@
-/*
- * 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
- * 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/>.
- */
-package org.meshtastic.core.network.repository
-
-import android.annotation.SuppressLint
-import java.security.cert.X509Certificate
-import javax.net.ssl.X509TrustManager
-
-@SuppressLint("CustomX509TrustManager", "TrustAllX509TrustManager")
-@Suppress("EmptyFunctionBlock")
-class TrustAllX509TrustManager : X509TrustManager {
-    override fun checkClientTrusted(chain: Array<X509Certificate>?, authType: String?) {}
-
-    override fun checkServerTrusted(chain: Array<X509Certificate>?, authType: String?) {}
-
-    override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
-}

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

@@ -22,9 +22,8 @@ import co.touchlab.kermit.Logger
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.coroutineScope
@@ -37,6 +36,7 @@ import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
 import org.meshtastic.core.ble.BleConnection
 import org.meshtastic.core.ble.BleConnectionFactory
@@ -396,14 +396,14 @@ class BleRadioTransport(
     }
 
     /** Closes the connection to the device. */
-    override fun close() {
+    override suspend fun close() {
         Logger.i { "[$address] Disconnecting. ${formatSessionStats()}" }
         connectionScope.cancel("close() called")
-        // GATT cleanup must outlive scope cancellation — GlobalScope is intentional.
-        // SharedRadioInterfaceService cancels the scope immediately after close(), so a
-        // coroutine launched there may never run, leaking BluetoothGatt (causes GATT 133).
-        @OptIn(DelicateCoroutinesApi::class)
-        GlobalScope.launch {
+        // GATT cleanup must run under NonCancellable so a cancelled caller cannot skip it,
+        // which would leak BluetoothGatt and trigger status 133 on the next reconnect.
+        // Using withContext (not runBlocking) keeps the caller's thread free — this is
+        // critical when close() is invoked from the main thread during process shutdown.
+        withContext(NonCancellable) {
             try {
                 withTimeoutOrNull(GATT_CLEANUP_TIMEOUT) { bleConnection.disconnect() }
             } catch (@Suppress("TooGenericExceptionCaught") e: Exception) {

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

@@ -144,7 +144,7 @@ class MockRadioTransport(
         }
     }
 
-    override fun close() {
+    override suspend fun close() {
         Logger.i { "Closing the mock transport" }
     }
 

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

@@ -30,7 +30,7 @@ class NopRadioTransport(val address: String) : RadioTransport {
         // No-op
     }
 
-    override fun close() {
+    override suspend fun close() {
         // No-op
     }
 }

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

@@ -35,7 +35,7 @@ abstract class StreamTransport(protected val callback: RadioTransportCallback, p
     private val codec =
         StreamFrameCodec(onPacketReceived = { callback.handleFromRadio(it) }, logTag = "StreamTransport")
 
-    override fun close() {
+    override suspend fun close() {
         Logger.d { "Closing stream for good" }
         onDeviceDisconnect(true)
     }

core/network/src/jvmAndroidMain/kotlin/org/meshtastic/core/network/radio/TcpRadioTransport.kt

@@ -74,7 +74,7 @@ open class TcpRadioTransport(
         transport.start(address)
     }
 
-    override fun close() {
+    override suspend fun close() {
         Logger.d { "[$address] Closing TCP transport" }
         closing = true
         transport.stop()

core/network/src/jvmMain/kotlin/org/meshtastic/core/network/SerialTransport.kt

@@ -154,7 +154,7 @@ private constructor(
         serialPort = null
     }
 
-    override fun close() {
+    override suspend fun close() {
         Logger.d { "[$portName] Closing serial transport" }
         readJob?.cancel()
         readJob = null