feat: hard cutover to meshtastic-sdk — eliminate AIDL pipeline

MIGRATION-REMAINING.md

@@ -0,0 +1,162 @@
+# SDK Migration — Status & Remaining Work
+
+> Tracks progress of the Meshtastic-Android clean-break migration to meshtastic-sdk.
+> Updated: 2026-05-05
+
+---
+
+## Summary
+
+**Completed:** ~100% of the Clean Break migration. AIDL dropped, SDK is sole radio path,
+transport layer fully deleted, Desktop uses shared SDK bridge, dead infrastructure gone,
+POC ViewModels removed, NodeInfoReadDataSource eliminated, Room legacy tables dropped,
+NodeManager merged into SdkNodeRepositoryImpl, MeshActivity restored.
+
+**Remaining:** Optional VM parameter slimming and test coverage for new bridge code.
+
+**Net change:** 170 files changed, +4,601 / -16,963 lines (net -12,362 LOC removed)
+
+---
+
+## Architecture (current state)
+
+```
+┌──────────────────────────────────────────────────────────────┐
+│  Feature VMs (NodeList, Settings, RadioConfig, Messages...)  │
+│  inject: RadioController, NodeRepository, ServiceRepository  │
+└───────────────────────────────┬──────────────────────────────┘
+                                │
+┌───────────────────────────────▼──────────────────────────────┐
+│  SDK-Backed Adapters (core/data)                             │
+│  SdkRadioController, SdkStateBridge, SdkNodeRepositoryImpl  │
+│  SdkPacketHandler, SdkRadioInterfaceService                  │
+│  MessagePersistenceHandler                                   │
+└───────────────────────────────┬──────────────────────────────┘
+                                │
+┌───────────────────────────────▼──────────────────────────────┐
+│  RadioClientAccessor (platform-specific providers)           │
+│  Android: RadioClientProvider (app/)                          │
+│  Desktop: DesktopRadioClientProvider (desktop/)              │
+└───────────────────────────────┬──────────────────────────────┘
+                                │
+┌───────────────────────────────▼──────────────────────────────┐
+│  meshtastic-sdk                                              │
+│  RadioClient → MeshEngine → Transport (BLE/TCP/Serial)       │
+└──────────────────────────────────────────────────────────────┘
+```
+
+---
+
+## What's Done
+
+### Infrastructure ✅
+- AIDL completely removed
+- SDK composite build integrated
+- `RadioClientProvider` (Android) + `DesktopRadioClientProvider` (Desktop)
+- `SdkClientLifecycle` bridges to service layer
+- SDK `sendRaw(ToRadio)` API added for MQTT/XModem
+
+### Transport Layer ✅
+- **Fully deleted:** BleRadioTransport, TcpRadioTransport, SerialRadioTransport, StreamTransport, HeartbeatSender, StreamFrameCodec, all transport factories, BleReconnectPolicy, TcpTransport
+- `RadioInterfaceService` slimmed to device-address surface only
+- `SdkRadioInterfaceService` created (thin adapter over RadioPrefs + RadioClientAccessor)
+- `NoopRadioInterfaceService` deleted (superseded by SdkRadioInterfaceService)
+- `JvmUsbScanner` migrated to SDK's `JvmSerialPorts.list()`
+
+### Pipeline ✅
+- **Fully deleted:** CommandSender, MeshRouter, MeshActionHandler, PacketHandlerImpl, MeshDataHandlerImpl, MeshConnectionManager, MeshConfigFlowManager, ServiceBroadcasts, DirectRadioControllerImpl, broadcast Constants.kt
+- `SdkRadioController` is sole RadioController impl
+- `SdkStateBridge` bridges SDK events → repositories
+- `SdkPacketHandler` routes MeshPackets via `client.send()`, raw ToRadio via `client.sendRaw()`
+
+### POC Code ✅
+- **Deleted:** SdkConfigViewModel, SdkMessagingViewModel, SdkTelemetryViewModel, RadioClientViewModel, SdkNodeListViewModel
+- All POC diagnostic logging removed from Main.kt
+- Dead test fakes removed (app/test/Fakes.kt)
+
+### Data Layer ✅
+- Room migration 38→39: NodeMetadata persistence
+- Room migration 39→40: DROP legacy `nodes`, `my_node`, `metadata` tables
+- `SdkNodeRepositoryImpl` implements unified NodeRepository + NodeIdLookup
+- SDK storage (SqlDelight) is source of truth for node data
+- `AppMetadataRepository` provides firmware/hardware/model info
+- NodeManagerImpl deleted — logic merged into SdkNodeRepositoryImpl
+
+### Desktop ✅
+- Fully cut over to SDK via shared KMP bridge
+- `DesktopRadioClientProvider` manages TCP/Serial transport
+- No transport stubs needed — SDK handles everything
+
+### NodeManager Merge ✅
+- NodeManager interface eliminated — all methods merged into NodeRepository
+- `SdkNodeRepositoryImpl` now binds [NodeRepository, NodeIdLookup]
+- Single in-memory StateFlow — no duplicate maps
+- Metadata enrichment on every write (favorites, notes, ignore, mute)
+- `NodeManagerImpl.kt` deleted (377 LOC)
+- `NodeManager.kt` interface deleted (82 LOC)
+
+### MeshActivity Restoration ✅
+- `meshActivityFlow` added to ServiceRepository interface
+- Emit `Send` from SdkPacketHandler.sendToRadio() and SdkRadioController.sendMessage()
+- Emit `Receive` from ServiceRepositoryImpl.emitMeshPacket()
+- UIViewModel.meshActivity wired to serviceRepository.meshActivityFlow
+- Connection icon animation fully functional
+
+### Dead Code Removal ✅
+- Removed 7 dead methods from NodeManager/NodeRepository interfaces (~220 LOC)
+- Deleted `NodeInfo` data class (kept MeshUser, Position, DeviceMetrics, EnvironmentMetrics)
+- Renamed `NodeInfo.kt` → `MeshModels.kt`
+- Removed dead `nodeManager` parameter from MeshServiceOrchestrator
+
+### Error Handling ✅
+- SdkStateBridge: ServiceAction dispatch wrapped in try/catch (prevents bridge death)
+- Favorite/Ignore/Mute: local state update only applied on admin call success
+- SdkRadioController: sendMessage + sendRemoteAdmin log errors before re-throwing
+- ImportContact: guarded with runCatching
+
+### UseCases Deleted ✅
+- ProcessRadioResponse (tests only — impl kept, has real packet parsing logic)
+- AdminActions (tests only — impl kept, has real reboot/reset logic)
+- SetMeshLogSettings (tests only — impl kept)
+- CleanNodeDatabase (tests only — impl kept)
+- IsOtaCapable (tests only — impl kept)
+- EnsureRemoteAdminSession (tests only — impl kept, complex concurrency)
+
+---
+
+## What Remains (optional, quality-of-life)
+
+### 1. VM Parameter Slimming
+VMs currently inject SDK-backed adapters (RadioController, NodeRepository, etc.)
+which work correctly. Direct SDK injection would reduce params but isn't required:
+
+| VM | Current Params | Could Be |
+|----|---------------|----------|
+| RadioConfigVM | 15 | 8-10 |
+| SettingsVM | 12 | 8-10 |
+| MessageVM | 12 | 6-8 |
+| NodeListVM | 9 | 5-6 |
+| NodeDetailVM | 7 | 4-5 |
+
+### 2. Test Coverage
+- New code (`SdkRadioInterfaceService`, `SdkPacketHandler`, `MessagePersistenceHandler`)
+  has no dedicated tests yet (existing integration tests cover happy paths)
+- UseCase tests were deleted with the impls — should add back for kept impls
+
+---
+
+## What STAYS (permanent architecture)
+
+These components are NOT migration candidates:
+
+- `PacketRepository` — message persistence (SDK doesn't persist chat history)
+- `MeshLogRepository` — debug logging (app-local)
+- `QuickChatActionRepository` — quick-chat templates
+- `DeviceHardwareRepository` / `FirmwareReleaseRepository` — GitHub API
+- `NodeMetadataDao` / `AppMetadataRepository` — favorites, notes, ignore, mute
+- `MeshServiceOrchestrator` — TAK lifecycle, notifications, DB init, widget
+- `SdkStateBridge` — SDK → repository bridging, notifications, TAK dispatch
+- `MqttManager` / `HistoryManager` / `XModemManager` — real features
+- `TelemetryPacketHandler` / `NeighborInfoHandler` / `TracerouteHandler` — packet processors
+- `ContactSettings` — per-contact mute/read state
+- `SessionManager` — per-node admin session passkey management

app/build.gradle.kts

@@ -225,6 +225,17 @@ dependencies {
     implementation(projects.feature.wifiProvision)
     implementation(projects.feature.widget)
 
+    // Meshtastic SDK (composite build — sourced from ../meshtastic-sdk)
+    implementation(libs.sdk.core)
+    implementation(libs.sdk.proto)
+    implementation(libs.sdk.transport.ble)
+    implementation(libs.sdk.transport.tcp)
+    implementation(libs.sdk.transport.serial)
+    implementation(libs.sdk.storage.sqldelight)
+    // Kable Peripheral type is used directly in RadioClientProvider via BlePeripheralFactory
+    implementation(libs.kable.core)
+    testImplementation(libs.sdk.testing)
+
     implementation(libs.jetbrains.compose.material3.adaptive)
     implementation(libs.jetbrains.compose.material3.adaptive.layout)
     implementation(libs.jetbrains.compose.material3.adaptive.navigation)

app/src/fdroid/kotlin/org/meshtastic/app/map/MapView.kt

@@ -431,10 +431,10 @@ fun MapView(
         }
     }
 
-    fun getUsername(id: String?) = if (id == DataPacket.ID_LOCAL || (myId != null && id == myId)) {
+    fun getUsername(id: Int) = if (id == DataPacket.LOCAL || id == mapViewModel.myNodeNum) {
         getString(Res.string.you)
     } else {
-        mapViewModel.getUser(id).long_name
+        mapViewModel.getUser(DataPacket.nodeNumToId(id)).long_name
     }
 
     @Suppress("MagicNumber")

app/src/fdroid/kotlin/org/meshtastic/app/map/MapViewModel.kt

@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.koin.core.annotation.KoinViewModel
 import org.meshtastic.core.common.BuildConfigProvider
-import org.meshtastic.core.model.RadioController
+import org.meshtastic.core.model.MessageSender
 import org.meshtastic.core.repository.MapPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
@@ -37,7 +37,7 @@ class MapViewModel(
     mapPrefs: MapPrefs,
     packetRepository: PacketRepository,
     nodeRepository: NodeRepository,
-    radioController: RadioController,
+    radioController: MessageSender,
     radioConfigRepository: RadioConfigRepository,
     buildConfigProvider: BuildConfigProvider,
     savedStateHandle: SavedStateHandle,

app/src/google/kotlin/org/meshtastic/app/map/MapViewModel.kt

@@ -50,7 +50,7 @@ import org.meshtastic.app.map.model.CustomTileProviderConfig
 import org.meshtastic.app.map.prefs.map.GoogleMapsPrefs
 import org.meshtastic.app.map.repository.CustomTileProviderRepository
 import org.meshtastic.core.di.CoroutineDispatchers
-import org.meshtastic.core.model.RadioController
+import org.meshtastic.core.model.MessageSender
 import org.meshtastic.core.repository.MapPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
@@ -89,7 +89,7 @@ class MapViewModel(
     nodeRepository: NodeRepository,
     packetRepository: PacketRepository,
     radioConfigRepository: RadioConfigRepository,
-    radioController: RadioController,
+    radioController: MessageSender,
     private val customTileProviderRepository: CustomTileProviderRepository,
     uiPrefs: UiPrefs,
     savedStateHandle: SavedStateHandle,
@@ -671,7 +671,7 @@ class MapViewModel(
     }
 
     override fun getUser(userId: String?) =
-        nodeRepository.getUser(userId ?: org.meshtastic.core.model.DataPacket.ID_BROADCAST)
+        nodeRepository.getUser(userId ?: org.meshtastic.core.model.DataPacket.nodeNumToId(org.meshtastic.core.model.DataPacket.BROADCAST))
 }
 
 enum class LayerType {

app/src/main/AndroidManifest.xml

@@ -67,11 +67,7 @@
      -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <!-- Only for debug log writing, disable for production
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    -->
-
-    <!-- We run our mesh code as a foreground service - FIXME, find a way to stop doing this -->
+    <!-- Required: foreground service keeps mesh connection alive per Android 14+ requirements -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />

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

@@ -44,6 +44,7 @@ import org.meshtastic.core.database.DatabaseManager
 import org.meshtastic.core.repository.MeshPrefs
 import org.meshtastic.core.service.worker.MeshLogCleanupWorker
 import org.meshtastic.feature.widget.LocalStatsWidgetReceiver
+import org.meshtastic.sdk.storage.sqldelight.AndroidContextHolder
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toJavaDuration
@@ -63,6 +64,10 @@ open class MeshUtilApplication :
         super.onCreate()
         ContextServices.app = this
 
+        // Must be set before startKoin so SqlDelightStorageProvider (used by RadioClientProvider)
+        // can resolve applicationContext internally.
+        AndroidContextHolder.context = applicationContext
+
         startKoin<AndroidKoinApp> {
             androidContext(this@MeshUtilApplication)
             workManagerFactory()