chore: project-wide cruft cleanup and dead code removal (#5249)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

.gitignore

@@ -15,7 +15,6 @@
 .externalNativeBuild
 .cxx
 /app/release
-/buildSrc/build
 **/debug/**
 **/release/**
 
@@ -56,3 +55,7 @@ firebase-debug.log
 .agent_plans/
 .agent_refs/
 .agent_artifacts/
+
+# Local library development clones
+/coil/
+/kable/

.pr5167.diff

@@ -1,295 +0,0 @@
-diff --git a/core/common/src/commonMain/kotlin/org/meshtastic/core/common/di/ApplicationCoroutineScope.kt b/core/common/src/commonMain/kotlin/org/meshtastic/core/common/di/ApplicationCoroutineScope.kt
-new file mode 100644
-index 0000000000..2a27b96906
---- /dev/null
-+++ b/core/common/src/commonMain/kotlin/org/meshtastic/core/common/di/ApplicationCoroutineScope.kt
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 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.common.di
-+
-+import kotlinx.coroutines.CoroutineScope
-+import kotlinx.coroutines.SupervisorJob
-+import org.koin.core.annotation.Single
-+import org.meshtastic.core.common.util.ioDispatcher
-+
-+/**
-+ * A process-wide [CoroutineScope] that outlives individual ViewModels and UI components.
-+ *
-+ * Use this scope for fire-and-forget cleanup work that must continue after a ViewModel's own scope has been cancelled
-+ * (for example, deleting temporary files in `onCleared()`). Backed by a [SupervisorJob] so failures in one child do not
-+ * cancel siblings, and by [ioDispatcher] so work runs off the main thread.
-+ *
-+ * Prefer scoping work to a more specific scope (like `viewModelScope`) whenever possible; this scope is an escape hatch
-+ * and should be used sparingly.
-+ */
-+interface ApplicationCoroutineScope : CoroutineScope
-+
-+@Single(binds = [ApplicationCoroutineScope::class])
-+internal class ApplicationCoroutineScopeImpl : ApplicationCoroutineScope {
-+    override val coroutineContext = SupervisorJob() + ioDispatcher
-+}
-diff --git a/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt b/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-index 231c84d401..5365ab95e2 100644
---- a/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-+++ b/core/ui/src/androidMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-@@ -37,12 +37,12 @@ import androidx.lifecycle.compose.LifecycleEventEffect
- import co.touchlab.kermit.Logger
- import com.eygraber.uri.toAndroidUri
- import com.eygraber.uri.toKmpUri
--import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.withContext
- import org.jetbrains.compose.resources.StringResource
- import org.jetbrains.compose.resources.getString
- import org.meshtastic.core.common.gpsDisabled
- import org.meshtastic.core.common.util.CommonUri
-+import org.meshtastic.core.common.util.ioDispatcher
- import java.net.URLEncoder
- 
- @Composable
-@@ -146,7 +146,7 @@ actual fun rememberReadTextFromUri(): suspend (uri: CommonUri, maxChars: Int) ->
-     val context = LocalContext.current
-     return remember(context) {
-         { uri, maxChars ->
--            withContext(Dispatchers.IO) {
-+            withContext(ioDispatcher) {
-                 @Suppress("TooGenericExceptionCaught")
-                 try {
-                     val androidUri = uri.toAndroidUri()
-diff --git a/core/ui/src/jvmMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt b/core/ui/src/jvmMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-index 031e1fe35d..a938f92ea6 100644
---- a/core/ui/src/jvmMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-+++ b/core/ui/src/jvmMain/kotlin/org/meshtastic/core/ui/util/PlatformUtils.kt
-@@ -20,10 +20,10 @@ package org.meshtastic.core.ui.util
- 
- import androidx.compose.runtime.Composable
- import co.touchlab.kermit.Logger
--import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.withContext
- import org.jetbrains.compose.resources.StringResource
- import org.meshtastic.core.common.util.CommonUri
-+import org.meshtastic.core.common.util.ioDispatcher
- import java.awt.Desktop
- import java.awt.FileDialog
- import java.awt.Frame
-@@ -89,7 +89,7 @@ actual fun rememberOpenFileLauncher(onUriReceived: (CommonUri?) -> Unit): (mimeT
- /** JVM — Reads text from a file URI. */
- @Composable
- actual fun rememberReadTextFromUri(): suspend (uri: CommonUri, maxChars: Int) -> String? = { uri, maxChars ->
--    withContext(Dispatchers.IO) {
-+    withContext(ioDispatcher) {
-         @Suppress("TooGenericExceptionCaught")
-         try {
-             val file = File(URI(uri.toString()))
-diff --git a/feature/firmware/src/commonMain/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModel.kt b/feature/firmware/src/commonMain/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModel.kt
-index dc1c459716..f8ff9fcac8 100644
---- a/feature/firmware/src/commonMain/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModel.kt
-+++ b/feature/firmware/src/commonMain/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModel.kt
-@@ -35,6 +35,7 @@ import kotlinx.coroutines.launch
- import kotlinx.coroutines.withTimeoutOrNull
- import org.jetbrains.compose.resources.StringResource
- import org.koin.core.annotation.KoinViewModel
-+import org.meshtastic.core.common.di.ApplicationCoroutineScope
- import org.meshtastic.core.common.util.CommonUri
- import org.meshtastic.core.common.util.safeCatching
- import org.meshtastic.core.database.entity.FirmwareRelease
-@@ -91,6 +92,7 @@ class FirmwareUpdateViewModel(
-     private val firmwareUpdateManager: FirmwareUpdateManager,
-     private val usbManager: FirmwareUsbManager,
-     private val fileHandler: FirmwareFileHandler,
-+    private val applicationScope: ApplicationCoroutineScope,
- ) : ViewModel() {
- 
-     private val _state = MutableStateFlow<FirmwareUpdateState>(FirmwareUpdateState.Idle)
-@@ -124,12 +126,10 @@ class FirmwareUpdateViewModel(
- 
-     override fun onCleared() {
-         super.onCleared()
--        // viewModelScope is already cancelled when onCleared() runs, so launch cleanup in a
--        // standalone scope. SupervisorJob prevents the coroutine from propagating failures to a
--        // shared parent, and NonCancellable on the launch keeps cleanup running even if the scope
--        // is cancelled concurrently.
--        @OptIn(kotlinx.coroutines.DelicateCoroutinesApi::class)
--        kotlinx.coroutines.GlobalScope.launch(NonCancellable) {
-+        // viewModelScope is already cancelled when onCleared() runs, so launch cleanup on the
-+        // application-wide scope (SupervisorJob + ioDispatcher). NonCancellable keeps cleanup
-+        // running even if something tries to cancel it mid-flight.
-+        applicationScope.launch(NonCancellable) {
-             tempFirmwareFile = cleanupTemporaryFiles(fileHandler, tempFirmwareFile)
-         }
-     }
-diff --git a/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateIntegrationTest.kt b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateIntegrationTest.kt
-index 4c48a1ced5..030d84effd 100644
---- a/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateIntegrationTest.kt
-+++ b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateIntegrationTest.kt
-@@ -108,6 +108,7 @@ class FirmwareUpdateIntegrationTest {
-         firmwareUpdateManager,
-         usbManager,
-         fileHandler,
-+        TestApplicationCoroutineScope(testDispatcher),
-     )
- 
-     @Test
-diff --git a/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelTest.kt b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelTest.kt
-index 7032ed4088..a8eddff838 100644
---- a/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelTest.kt
-+++ b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelTest.kt
-@@ -124,6 +124,7 @@ class FirmwareUpdateViewModelTest {
-         firmwareUpdateManager,
-         usbManager,
-         fileHandler,
-+        TestApplicationCoroutineScope(testDispatcher),
-     )
- 
-     @Test
-diff --git a/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/TestApplicationCoroutineScope.kt b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/TestApplicationCoroutineScope.kt
-new file mode 100644
-index 0000000000..3ef5c44ef4
---- /dev/null
-+++ b/feature/firmware/src/commonTest/kotlin/org/meshtastic/feature/firmware/TestApplicationCoroutineScope.kt
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 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.feature.firmware
-+
-+import kotlinx.coroutines.CoroutineDispatcher
-+import kotlinx.coroutines.CoroutineScope
-+import kotlinx.coroutines.SupervisorJob
-+import org.meshtastic.core.common.di.ApplicationCoroutineScope
-+
-+internal class TestApplicationCoroutineScope(dispatcher: CoroutineDispatcher) :
-+    ApplicationCoroutineScope,
-+    CoroutineScope by CoroutineScope(SupervisorJob() + dispatcher)
-diff --git a/feature/firmware/src/jvmTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelFileTest.kt b/feature/firmware/src/jvmTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelFileTest.kt
-index acb1545bdd..23a0d03ab2 100644
---- a/feature/firmware/src/jvmTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelFileTest.kt
-+++ b/feature/firmware/src/jvmTest/kotlin/org/meshtastic/feature/firmware/FirmwareUpdateViewModelFileTest.kt
-@@ -116,6 +116,7 @@ class FirmwareUpdateViewModelFileTest {
-         firmwareUpdateManager,
-         usbManager,
-         fileHandler,
-+        TestApplicationCoroutineScope(testDispatcher),
-     )
- 
-     // -----------------------------------------------------------------------
-diff --git a/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt b/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-index c251b4d5ef..315ad1da85 100644
---- a/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-+++ b/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-@@ -27,6 +27,7 @@ import co.touchlab.kermit.Logger
- import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.withContext
-+import org.meshtastic.core.common.util.ioDispatcher
- import org.meshtastic.core.resources.Res
- import org.meshtastic.core.resources.debug_export_failed
- import org.meshtastic.core.resources.debug_export_success
-@@ -48,7 +49,7 @@ actual fun rememberLogExporter(logsProvider: suspend () -> List<DebugViewModel.U
- }
- 
- private suspend fun exportAllLogsToUri(context: Context, targetUri: Uri, logs: List<DebugViewModel.UiMeshLog>) =
--    withContext(Dispatchers.IO) {
-+    withContext(ioDispatcher) {
-         try {
-             if (logs.isEmpty()) {
-                 withContext(Dispatchers.Main) { context.showToast(Res.string.debug_export_failed, "No logs to export") }
-diff --git a/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt b/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-index 9afde85e5f..a28a576788 100644
---- a/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-+++ b/feature/settings/src/androidMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-@@ -24,9 +24,9 @@ import androidx.compose.runtime.Composable
- import androidx.compose.runtime.rememberCoroutineScope
- import androidx.compose.ui.platform.LocalContext
- import co.touchlab.kermit.Logger
--import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.withContext
-+import org.meshtastic.core.common.util.ioDispatcher
- 
- @Composable
- actual fun rememberDataPackageExporter(dataPackageProvider: suspend () -> ByteArray): (fileName: String) -> Unit {
-@@ -41,7 +41,7 @@ actual fun rememberDataPackageExporter(dataPackageProvider: suspend () -> ByteAr
-     return { fileName -> exportLauncher.launch(fileName) }
- }
- 
--private suspend fun exportZipToUri(context: Context, targetUri: Uri, data: ByteArray) = withContext(Dispatchers.IO) {
-+private suspend fun exportZipToUri(context: Context, targetUri: Uri, data: ByteArray) = withContext(ioDispatcher) {
-     try {
-         context.contentResolver.openOutputStream(targetUri)?.use { os -> os.write(data) }
-         Logger.i { "TAK data package exported successfully to $targetUri" }
-diff --git a/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt b/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-index 5b63cc90a3..a9a7285593 100644
---- a/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-+++ b/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/debugging/LogExporter.kt
-@@ -19,9 +19,9 @@ package org.meshtastic.feature.settings.debugging
- import androidx.compose.runtime.Composable
- import androidx.compose.runtime.rememberCoroutineScope
- import co.touchlab.kermit.Logger
--import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.withContext
-+import org.meshtastic.core.common.util.ioDispatcher
- import java.awt.FileDialog
- import java.awt.Frame
- import java.io.File
-@@ -41,7 +41,7 @@ actual fun rememberLogExporter(logsProvider: suspend () -> List<DebugViewModel.U
-                 return@launch
-             }
- 
--            withContext(Dispatchers.IO) {
-+            withContext(ioDispatcher) {
-                 // Run file dialog to ask user where to save
-                 val fileDialog = FileDialog(null as Frame?, "Export Logs", FileDialog.SAVE)
-                 fileDialog.file = fileName
-diff --git a/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt b/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-index 9fb71379fc..bfbb85bc0d 100644
---- a/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-+++ b/feature/settings/src/jvmMain/kotlin/org/meshtastic/feature/settings/tak/PrefExporter.kt
-@@ -19,9 +19,9 @@ package org.meshtastic.feature.settings.tak
- import androidx.compose.runtime.Composable
- import androidx.compose.runtime.rememberCoroutineScope
- import co.touchlab.kermit.Logger
--import kotlinx.coroutines.Dispatchers
- import kotlinx.coroutines.launch
- import kotlinx.coroutines.withContext
-+import org.meshtastic.core.common.util.ioDispatcher
- import java.awt.FileDialog
- import java.awt.Frame
- import java.io.File
-@@ -44,7 +44,7 @@ actual fun rememberDataPackageExporter(dataPackageProvider: suspend () -> ByteAr
-                 if (directory != null && file != null) {
-                     val targetFile = File(directory, file)
-                     val data = dataPackageProvider()
--                    withContext(Dispatchers.IO) { targetFile.writeBytes(data) }
-+                    withContext(ioDispatcher) { targetFile.writeBytes(data) }
-                     Logger.i { "TAK data package exported successfully to ${targetFile.absolutePath}" }
-                 }
-             }

app/src/fdroid/kotlin/org/meshtastic/app/map/component/DownloadButton.kt

@@ -57,9 +57,3 @@ fun DownloadButton(enabled: Boolean, onClick: () -> Unit) {
         }
     }
 }
-
-// @Preview(showBackground = true)
-// @Composable
-// private fun DownloadButtonPreview() {
-//    DownloadButton(true, onClick = {})
-// }

app/src/fdroid/kotlin/org/meshtastic/app/map/model/CustomTileSource.kt

@@ -22,7 +22,6 @@ import org.osmdroid.tileprovider.tilesource.TileSourceFactory
 import org.osmdroid.tileprovider.tilesource.TileSourcePolicy
 import org.osmdroid.util.MapTileIndex
 
-@Suppress("UnusedPrivateProperty")
 class CustomTileSource {
 
     companion object {
@@ -102,62 +101,6 @@ class CustomTileSource {
                             mImageFilenameEnding
                         )
             }
-        private val USGS_HYDRO_CACHE =
-            object :
-                OnlineTileSourceBase(
-                    "USGS Hydro Cache",
-                    0,
-                    18,
-                    256,
-                    "",
-                    arrayOf("https://basemap.nationalmap.gov/arcgis/rest/services/USGSHydroCached/MapServer/tile/"),
-                    "USGS",
-                    TileSourcePolicy(
-                        2,
-                        TileSourcePolicy.FLAG_NO_PREVENTIVE or
-                            TileSourcePolicy.FLAG_USER_AGENT_MEANINGFUL or
-                            TileSourcePolicy.FLAG_USER_AGENT_NORMALIZED,
-                    ),
-                ) {
-                override fun getTileURLString(pMapTileIndex: Long): String = baseUrl +
-                    (
-                        MapTileIndex.getZoom(pMapTileIndex).toString() +
-                            "/" +
-                            MapTileIndex.getY(pMapTileIndex) +
-                            "/" +
-                            MapTileIndex.getX(pMapTileIndex) +
-                            mImageFilenameEnding
-                        )
-            }
-        private val USGS_SHADED_RELIEF =
-            object :
-                OnlineTileSourceBase(
-                    "USGS Shaded Relief Only",
-                    0,
-                    18,
-                    256,
-                    "",
-                    arrayOf(
-                        "https://basemap.nationalmap.gov/arcgis/rest/services/USGSShadedReliefOnly/MapServer/tile/",
-                    ),
-                    "USGS",
-                    TileSourcePolicy(
-                        2,
-                        TileSourcePolicy.FLAG_NO_PREVENTIVE or
-                            TileSourcePolicy.FLAG_USER_AGENT_MEANINGFUL or
-                            TileSourcePolicy.FLAG_USER_AGENT_NORMALIZED,
-                    ),
-                ) {
-                override fun getTileURLString(pMapTileIndex: Long): String = baseUrl +
-                    (
-                        MapTileIndex.getZoom(pMapTileIndex).toString() +
-                            "/" +
-                            MapTileIndex.getY(pMapTileIndex) +
-                            "/" +
-                            MapTileIndex.getX(pMapTileIndex) +
-                            mImageFilenameEnding
-                        )
-            }
 
         /** WMS TILE SERVER More research is required to get this to function correctly with overlays */
         val NOAA_RADAR_WMS =
@@ -180,7 +123,6 @@ class CustomTileSource {
         private val USGS_TOPO: OnlineTileSourceBase = TileSourceFactory.USGS_TOPO
         private val OPEN_TOPO: OnlineTileSourceBase = TileSourceFactory.OpenTopo
         private val USGS_SAT: OnlineTileSourceBase = TileSourceFactory.USGS_SAT
-        private val SEAMAP: OnlineTileSourceBase = TileSourceFactory.OPEN_SEAMAP
         val DEFAULT_TILE_SOURCE: OnlineTileSourceBase = TileSourceFactory.DEFAULT_TILE_SOURCE
 
         /** Source for each available [ITileSource] and their display names. */

app/src/google/kotlin/org/meshtastic/app/map/component/EditWaypointDialog.kt

@@ -176,7 +176,7 @@ fun EditWaypointDialog(
                         label = { Text(stringResource(Res.string.description)) },
                         keyboardOptions =
                         KeyboardOptions.Default.copy(keyboardType = KeyboardType.Text, imeAction = ImeAction.Done),
-                        keyboardActions = KeyboardActions(onDone = { /* Handle next/done focus */ }),
+                        keyboardActions = KeyboardActions(onDone = {}),
                         modifier = Modifier.fillMaxWidth(),
                         minLines = 2,
                         maxLines = 3,

app/src/main/kotlin/org/meshtastic/app/MeshUtilApplication.kt

@@ -137,11 +137,3 @@ open class MeshUtilApplication :
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder().setWorkerFactory(get()).build()
 }
-
-fun logAssert(executeReliableWrite: Boolean) {
-    if (!executeReliableWrite) {
-        val ex = AssertionError("Assertion failed")
-        Logger.e(ex) { "logAssert" }
-        throw ex
-    }
-}

app/src/main/res/drawable-anydpi/app_icon.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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/>.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF"
-    android:alpha="0.8">
-  <group android:scaleX="0.24"
-      android:scaleY="0.24"
-      android:translateY="5.4">
-    <path
-        android:pathData="M64.716,13.073L37.867,52.447L32.204,48.585L61.878,5.068C62.516,4.132 63.575,3.572 64.707,3.571C65.839,3.57 66.899,4.128 67.538,5.063L97.281,48.512L91.625,52.384L64.716,13.073Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M8.379,52.406L39.741,6.415L34.078,2.553L2.716,48.544L8.379,52.406Z"
-        android:fillColor="#ffffff"/>
-  </group>
-</vector>

app/src/main/res/drawable/ic_refresh.xml

@@ -1,27 +0,0 @@
-<!--
-  ~ 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/>.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>

core/common/src/commonMain/kotlin/org/meshtastic/core/common/util/TimeUtils.kt

@@ -38,6 +38,3 @@ val systemTimeZone: TimeZone
 
 /** Converts these milliseconds to an [Instant]. */
 fun Long.toInstant(): Instant = Instant.fromEpochMilliseconds(this)
-
-/** Converts these seconds to an [Instant]. */
-fun Int.secondsToInstant(): Instant = Instant.fromEpochSeconds(this.toLong())

core/service/src/androidMain/kotlin/org/meshtastic/core/service/MeshServiceStarter.kt

@@ -27,11 +27,6 @@ import org.meshtastic.core.service.worker.ServiceKeepAliveWorker
 
 // / Helper function to start running our service
 fun MeshService.Companion.startService(context: Context) {
-    // Bind to our service using the same mechanism an external client would use (for testing coverage)
-    // The following would work for us, but not external users:
-    // val intent = Intent(this, MeshService::class.java)
-    // intent.action = IMeshService::class.java.name
-
     // Before binding we want to explicitly create - so the service stays alive forever (so it can keep
     // listening for the bluetooth packets arriving from the radio. And when they arrive forward them
     // to Signal or whatever.

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

@@ -115,7 +115,6 @@ fun SwitchListItem(
  *
  * @see [LinkedCoordinatesItem] for example usage
  */
-@Suppress("UnusedParameter")
 @Composable
 fun BasicListItem(
     text: String,

feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt

@@ -89,14 +89,6 @@ open class ScannerViewModel(
      */
     val connectionProgressText: StateFlow<String?> = _connectionProgressText.asStateFlow()
 
-    /**
-     * Back-compat alias for [connectionProgressText]. Kept so existing screens/tests don't need a synchronised rename
-     * in the same commit.
-     */
-    @Deprecated("Use connectionProgressText", ReplaceWith("connectionProgressText"))
-    val errorText: StateFlow<String?>
-        get() = connectionProgressText
-
     // ── BLE scanning ──────────────────────────────────────────────────────────────────────────
     private val _isBleScanning = MutableStateFlow(false)
     val isBleScanning: StateFlow<Boolean> = _isBleScanning.asStateFlow()

feature/connections/src/commonTest/kotlin/org/meshtastic/feature/connections/ScannerViewModelTest.kt

@@ -114,8 +114,8 @@ class ScannerViewModelTest {
     }
 
     @Test
-    fun `errorText reflects connectionProgress`() = runTest {
-        viewModel.errorText.test {
+    fun `connectionProgressText reflects connectionProgress`() = runTest {
+        viewModel.connectionProgressText.test {
             assertEquals("", awaitItem())
             serviceRepository.setConnectionProgress("Connecting...")
             assertEquals("Connecting...", awaitItem())

feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/DeliveryInfoDialog.kt

@@ -35,13 +35,11 @@ import org.meshtastic.core.resources.relays
 import org.meshtastic.core.resources.resend
 import org.meshtastic.core.ui.component.MeshtasticDialog
 
-@Suppress("UnusedParameter")
 @Composable
 fun DeliveryInfo(
     title: StringResource,
     resendOption: Boolean,
     text: StringResource? = null,
-    relayNodeName: String? = null,
     relays: Int = 0,
     onConfirm: (() -> Unit) = {},
     onDismiss: () -> Unit = {},

feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/MessageListPaged.kt

@@ -111,8 +111,6 @@ internal fun MessageListPaged(
     showStatusDialog?.let { message ->
         MessageStatusDialog(
             message = message,
-            nodes = state.nodes,
-            ourNode = state.ourNode,
             resendOption = message.status?.equals(MessageStatus.ERROR) ?: false,
             onResend = {
                 handlers.onDeleteMessages(listOf(message.uuid))
@@ -133,8 +131,6 @@ internal fun MessageListPaged(
                 handlers.onSendReaction(reaction.emoji, reaction.replyId)
                 showReactionDialog = null
             },
-            nodes = state.nodes,
-            ourNode = state.ourNode,
         )
     }
 

feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/MessageScreenComponents.kt

@@ -46,7 +46,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -584,28 +583,12 @@ fun UnreadMessagesDivider(modifier: Modifier = Modifier) {
 // region ── MessageStatusDialog ──
 
 @Composable
-fun MessageStatusDialog(
-    message: Message,
-    nodes: List<Node>,
-    ourNode: Node?,
-    resendOption: Boolean,
-    onResend: () -> Unit,
-    onDismiss: () -> Unit,
-) {
+fun MessageStatusDialog(message: Message, resendOption: Boolean, onResend: () -> Unit, onDismiss: () -> Unit) {
     val (title, text) = message.getStatusStringRes()
-    val relayNodeName by
-        remember(message.relayNode, nodes, ourNode) {
-            derivedStateOf {
-                message.relayNode?.let { relayNodeId ->
-                    Node.getRelayNode(relayNodeId, nodes, ourNode?.num)?.user?.long_name
-                }
-            }
-        }
     DeliveryInfo(
         title = title,
         resendOption = resendOption,
         text = text,
-        relayNodeName = relayNodeName,
         relays = message.relays,
         onConfirm = onResend,
         onDismiss = onDismiss,

feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/Reaction.kt

@@ -55,7 +55,6 @@ import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.stringResource
 import org.meshtastic.core.model.DataPacket
 import org.meshtastic.core.model.MessageStatus
-import org.meshtastic.core.model.Node
 import org.meshtastic.core.model.Reaction
 import org.meshtastic.core.model.getStringResFrom
 import org.meshtastic.core.model.util.getShortDateTime
@@ -195,8 +194,6 @@ internal fun ReactionDialog(
     onDismiss: () -> Unit = {},
     myId: String? = null,
     onResend: (Reaction) -> Unit = {},
-    nodes: List<Node> = emptyList(),
-    ourNode: Node? = null,
 ) = BottomSheetDialog(onDismiss = onDismiss, modifier = Modifier.fillMaxHeight(fraction = .3f)) {
     val groupedEmojis = reactions.groupBy { it.emoji }
     var selectedEmoji by remember { mutableStateOf<String?>(null) }
@@ -217,11 +214,6 @@ internal fun ReactionDialog(
                 MessageStatus.UNKNOWN -> Res.string.message_status_unknown
             }
 
-        val relayNodeName =
-            reaction.relayNode?.let { relayNodeId ->
-                Node.getRelayNode(relayNodeId, nodes, ourNode?.num)?.user?.long_name
-            }
-
         DeliveryInfo(
             title = title,
             text = text,
@@ -231,7 +223,6 @@ internal fun ReactionDialog(
                 showStatusDialog = null
             },
             onDismiss = { showStatusDialog = null },
-            relayNodeName = relayNodeName,
             relays = reaction.relays,
         )
     }

fix_dispatchers.py

@@ -1,63 +0,0 @@
-
-import os
-import re
-
-files = [
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/CommandSenderImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshActionHandlerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigFlowManagerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigHandlerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConnectionManagerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshDataHandlerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshMessageProcessorImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MqttManagerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/NeighborInfoHandlerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/PacketHandlerImpl.kt",
-    "core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/TracerouteHandlerImpl.kt",
-    "feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt",
-    "feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt",
-    "feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/MessageViewModel.kt",
-    "feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/QuickChatViewModel.kt",
-    "feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/ui/contact/ContactsViewModel.kt",
-    "feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/detail/CommonNodeRequestActions.kt",
-    "feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/detail/NodeManagementActions.kt",
-    "feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt"
-]
-
-for file_path in files:
-    if not os.path.exists(file_path):
-        print(f"File not found: {file_path}")
-        continue
-    
-    with open(file_path, 'r') as f:
-        content = f.read()
-    
-    # Replace Dispatchers.IO with ioDispatcher
-    new_content = re.sub(r'\bDispatchers\.IO\b', 'ioDispatcher', content)
-    new_content = re.sub(r'\bkotlinx\.coroutines\.Dispatchers\.IO\b', 'ioDispatcher', new_content)
-    
-    if new_content == content:
-        print(f"No changes in {file_path}")
-        continue
-
-    # Add import if missing
-    if 'import org.meshtastic.core.common.util.ioDispatcher' not in new_content:
-        # Find the package line to insert after, or just after other imports
-        lines = new_content.splitlines()
-        inserted = False
-        for i, line in enumerate(lines):
-            if line.startswith('package '):
-                lines.insert(i + 2, 'import org.meshtastic.core.common.util.ioDispatcher')
-                inserted = True
-                break
-        if not inserted:
-            lines.insert(0, 'import org.meshtastic.core.common.util.ioDispatcher')
-        new_content = '\n'.join(lines) + '\n'
-
-    # Check if Dispatchers is still used
-    if 'Dispatchers.' not in new_content:
-        new_content = re.sub(r'^import kotlinx\.coroutines\.Dispatchers\n', '', new_content, flags=re.MULTILINE)
-
-    with open(file_path, 'w') as f:
-        f.write(new_content)
-    print(f"Fixed {file_path}")