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

jamesarich · Copilot · Copilot · web-flow · commit 247f342210a9 · 2026-04-27T16:09:37.000Z
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
diff --git a/.gitignore b/.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/
diff --git a/.pr5167.diff b/.pr5167.diff
diff --git a/app/src/fdroid/kotlin/org/meshtastic/app/map/component/DownloadButton.kt b/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 = {})
-// }
diff --git a/app/src/fdroid/kotlin/org/meshtastic/app/map/model/CustomTileSource.kt b/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. */
diff --git a/app/src/google/kotlin/org/meshtastic/app/map/component/EditWaypointDialog.kt b/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,
diff --git a/app/src/main/kotlin/org/meshtastic/app/MeshUtilApplication.kt b/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
-    }
-}
diff --git a/app/src/main/res/drawable-anydpi/app_icon.xml b/app/src/main/res/drawable-anydpi/app_icon.xml
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
diff --git a/core/common/src/commonMain/kotlin/org/meshtastic/core/common/util/TimeUtils.kt b/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())
diff --git a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/MeshServiceStarter.kt b/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.
diff --git a/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/ListItem.kt b/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,
diff --git a/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt b/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()
diff --git a/feature/connections/src/commonTest/kotlin/org/meshtastic/feature/connections/ScannerViewModelTest.kt b/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())
diff --git a/feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/DeliveryInfoDialog.kt b/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 = {},
diff --git a/feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/MessageListPaged.kt b/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,
         )
     }
 
diff --git a/feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/MessageScreenComponents.kt b/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,
diff --git a/feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/Reaction.kt b/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,
         )
     }
diff --git a/fix_dispatchers.py b/fix_dispatchers.py

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,3 @@ fun DownloadButton(enabled: Boolean, onClick: () -> Unit) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`-`
`61`		`-// @Preview(showBackground = true)`
`62`		`-// @Composable`
`63`		`-// private fun DownloadButtonPreview() {`
`64`		`-// DownloadButton(true, onClick = {})`
`65`		`-// }`