refactor: migrate core modules to Kotlin Multiplatform and consolidat… (#4735)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

feature/map/build.gradle.kts

@@ -37,7 +37,10 @@ dependencies {
     implementation(projects.core.service)
     implementation(projects.core.resources)
     implementation(projects.core.ui)
+    implementation(projects.core.di)
 
+    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.datastore.preferences)
     implementation(libs.accompanist.permissions)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.annotation)

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

@@ -43,17 +43,17 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
-import org.meshtastic.core.data.model.CustomTileProviderConfig
-import org.meshtastic.core.data.repository.CustomTileProviderRepository
 import org.meshtastic.core.datastore.UiPreferencesDataSource
 import org.meshtastic.core.model.RadioController
 import org.meshtastic.core.navigation.MapRoutes
-import org.meshtastic.core.prefs.map.GoogleMapsPrefs
 import org.meshtastic.core.repository.MapPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
 import org.meshtastic.core.repository.RadioConfigRepository
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
+import org.meshtastic.feature.map.model.CustomTileProviderConfig
+import org.meshtastic.feature.map.prefs.map.GoogleMapsPrefs
+import org.meshtastic.feature.map.repository.CustomTileProviderRepository
 import org.meshtastic.proto.Config
 import java.io.File
 import java.io.FileOutputStream

feature/map/src/google/kotlin/org/meshtastic/feature/map/component/CustomTileProviderManagerSheet.kt

@@ -51,7 +51,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.collectLatest
 import org.jetbrains.compose.resources.stringResource
-import org.meshtastic.core.data.model.CustomTileProviderConfig
 import org.meshtastic.core.resources.Res
 import org.meshtastic.core.resources.add_custom_tile_source
 import org.meshtastic.core.resources.add_local_mbtiles_file
@@ -72,6 +71,7 @@ import org.meshtastic.core.resources.url_template_hint
 import org.meshtastic.core.ui.component.MeshtasticDialog
 import org.meshtastic.core.ui.util.showToast
 import org.meshtastic.feature.map.MapViewModel
+import org.meshtastic.feature.map.model.CustomTileProviderConfig
 
 @Suppress("LongMethod")
 @Composable

feature/map/src/google/kotlin/org/meshtastic/feature/map/model/CustomTileProviderConfig.kt

@@ -0,0 +1,31 @@
+/*
+ * 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.feature.map.model
+
+import kotlinx.serialization.Serializable
+import kotlin.uuid.Uuid
+
+@Serializable
+data class CustomTileProviderConfig(
+    val id: String = Uuid.random().toString(),
+    val name: String,
+    val urlTemplate: String,
+    val localUri: String? = null,
+) {
+    val isLocal: Boolean
+        get() = localUri != null
+}

feature/map/src/google/kotlin/org/meshtastic/feature/map/prefs/di/GoogleMapsModule.kt

@@ -0,0 +1,68 @@
+/*
+ * 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.feature.map.prefs.di
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.SharedPreferencesMigration
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import org.meshtastic.feature.map.prefs.map.GoogleMapsPrefs
+import org.meshtastic.feature.map.prefs.map.GoogleMapsPrefsImpl
+import org.meshtastic.feature.map.repository.CustomTileProviderRepository
+import org.meshtastic.feature.map.repository.CustomTileProviderRepositoryImpl
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class GoogleMapsDataStore
+
+@InstallIn(SingletonComponent::class)
+@Module
+interface GoogleMapsModule {
+
+    @Binds fun bindGoogleMapsPrefs(googleMapsPrefsImpl: GoogleMapsPrefsImpl): GoogleMapsPrefs
+
+    @Binds
+    @Singleton
+    fun bindCustomTileProviderRepository(impl: CustomTileProviderRepositoryImpl): CustomTileProviderRepository
+
+    companion object {
+        private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+        @Provides
+        @Singleton
+        @GoogleMapsDataStore
+        fun provideGoogleMapsDataStore(@ApplicationContext context: Context): DataStore<Preferences> =
+            PreferenceDataStoreFactory.create(
+                migrations = listOf(SharedPreferencesMigration(context, "google_maps_prefs")),
+                scope = scope,
+                produceFile = { context.preferencesDataStoreFile("google_maps_ds") },
+            )
+    }
+}

feature/map/src/google/kotlin/org/meshtastic/feature/map/prefs/map/GoogleMapsPrefs.kt

@@ -0,0 +1,183 @@
+/*
+ * 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.feature.map.prefs.map
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.doublePreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.floatPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import com.google.maps.android.compose.MapType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import org.meshtastic.core.di.CoroutineDispatchers
+import org.meshtastic.feature.map.prefs.di.GoogleMapsDataStore
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Interface for prefs specific to Google Maps. For general map prefs, see MapPrefs. */
+interface GoogleMapsPrefs {
+    val selectedGoogleMapType: StateFlow<String?>
+
+    fun setSelectedGoogleMapType(value: String?)
+
+    val selectedCustomTileUrl: StateFlow<String?>
+
+    fun setSelectedCustomTileUrl(value: String?)
+
+    val hiddenLayerUrls: StateFlow<Set<String>>
+
+    fun setHiddenLayerUrls(value: Set<String>)
+
+    val cameraTargetLat: StateFlow<Double>
+
+    fun setCameraTargetLat(value: Double)
+
+    val cameraTargetLng: StateFlow<Double>
+
+    fun setCameraTargetLng(value: Double)
+
+    val cameraZoom: StateFlow<Float>
+
+    fun setCameraZoom(value: Float)
+
+    val cameraTilt: StateFlow<Float>
+
+    fun setCameraTilt(value: Float)
+
+    val cameraBearing: StateFlow<Float>
+
+    fun setCameraBearing(value: Float)
+
+    val networkMapLayers: StateFlow<Set<String>>
+
+    fun setNetworkMapLayers(value: Set<String>)
+}
+
+@Singleton
+class GoogleMapsPrefsImpl
+@Inject
+constructor(
+    @GoogleMapsDataStore private val dataStore: DataStore<Preferences>,
+    dispatchers: CoroutineDispatchers,
+) : GoogleMapsPrefs {
+    private val scope = CoroutineScope(SupervisorJob() + dispatchers.default)
+
+    override val selectedGoogleMapType: StateFlow<String?> =
+        dataStore.data
+            .map { it[KEY_SELECTED_GOOGLE_MAP_TYPE_PREF] ?: MapType.NORMAL.name }
+            .stateIn(scope, SharingStarted.Eagerly, MapType.NORMAL.name)
+
+    override fun setSelectedGoogleMapType(value: String?) {
+        scope.launch {
+            dataStore.edit { prefs ->
+                if (value == null) {
+                    prefs.remove(KEY_SELECTED_GOOGLE_MAP_TYPE_PREF)
+                } else {
+                    prefs[KEY_SELECTED_GOOGLE_MAP_TYPE_PREF] = value
+                }
+            }
+        }
+    }
+
+    override val selectedCustomTileUrl: StateFlow<String?> =
+        dataStore.data.map { it[KEY_SELECTED_CUSTOM_TILE_URL_PREF] }.stateIn(scope, SharingStarted.Eagerly, null)
+
+    override fun setSelectedCustomTileUrl(value: String?) {
+        scope.launch {
+            dataStore.edit { prefs ->
+                if (value == null) {
+                    prefs.remove(KEY_SELECTED_CUSTOM_TILE_URL_PREF)
+                } else {
+                    prefs[KEY_SELECTED_CUSTOM_TILE_URL_PREF] = value
+                }
+            }
+        }
+    }
+
+    override val hiddenLayerUrls: StateFlow<Set<String>> =
+        dataStore.data
+            .map { it[KEY_HIDDEN_LAYER_URLS_PREF] ?: emptySet() }
+            .stateIn(scope, SharingStarted.Eagerly, emptySet())
+
+    override fun setHiddenLayerUrls(value: Set<String>) {
+        scope.launch { dataStore.edit { it[KEY_HIDDEN_LAYER_URLS_PREF] = value } }
+    }
+
+    override val cameraTargetLat: StateFlow<Double> =
+        dataStore.data.map { it[KEY_CAMERA_TARGET_LAT_PREF] ?: 0.0 }.stateIn(scope, SharingStarted.Eagerly, 0.0)
+
+    override fun setCameraTargetLat(value: Double) {
+        scope.launch { dataStore.edit { it[KEY_CAMERA_TARGET_LAT_PREF] = value } }
+    }
+
+    override val cameraTargetLng: StateFlow<Double> =
+        dataStore.data.map { it[KEY_CAMERA_TARGET_LNG_PREF] ?: 0.0 }.stateIn(scope, SharingStarted.Eagerly, 0.0)
+
+    override fun setCameraTargetLng(value: Double) {
+        scope.launch { dataStore.edit { it[KEY_CAMERA_TARGET_LNG_PREF] = value } }
+    }
+
+    override val cameraZoom: StateFlow<Float> =
+        dataStore.data.map { it[KEY_CAMERA_ZOOM_PREF] ?: 7f }.stateIn(scope, SharingStarted.Eagerly, 7f)
+
+    override fun setCameraZoom(value: Float) {
+        scope.launch { dataStore.edit { it[KEY_CAMERA_ZOOM_PREF] = value } }
+    }
+
+    override val cameraTilt: StateFlow<Float> =
+        dataStore.data.map { it[KEY_CAMERA_TILT_PREF] ?: 0f }.stateIn(scope, SharingStarted.Eagerly, 0f)
+
+    override fun setCameraTilt(value: Float) {
+        scope.launch { dataStore.edit { it[KEY_CAMERA_TILT_PREF] = value } }
+    }
+
+    override val cameraBearing: StateFlow<Float> =
+        dataStore.data.map { it[KEY_CAMERA_BEARING_PREF] ?: 0f }.stateIn(scope, SharingStarted.Eagerly, 0f)
+
+    override fun setCameraBearing(value: Float) {
+        scope.launch { dataStore.edit { it[KEY_CAMERA_BEARING_PREF] = value } }
+    }
+
+    override val networkMapLayers: StateFlow<Set<String>> =
+        dataStore.data
+            .map { it[KEY_NETWORK_MAP_LAYERS_PREF] ?: emptySet() }
+            .stateIn(scope, SharingStarted.Eagerly, emptySet())
+
+    override fun setNetworkMapLayers(value: Set<String>) {
+        scope.launch { dataStore.edit { it[KEY_NETWORK_MAP_LAYERS_PREF] = value } }
+    }
+
+    companion object {
+        val KEY_SELECTED_GOOGLE_MAP_TYPE_PREF = stringPreferencesKey("selected_google_map_type")
+        val KEY_SELECTED_CUSTOM_TILE_URL_PREF = stringPreferencesKey("selected_custom_tile_url")
+        val KEY_HIDDEN_LAYER_URLS_PREF = stringSetPreferencesKey("hidden_layer_urls")
+        val KEY_CAMERA_TARGET_LAT_PREF = doublePreferencesKey("camera_target_lat")
+        val KEY_CAMERA_TARGET_LNG_PREF = doublePreferencesKey("camera_target_lng")
+        val KEY_CAMERA_ZOOM_PREF = floatPreferencesKey("camera_zoom")
+        val KEY_CAMERA_TILT_PREF = floatPreferencesKey("camera_tilt")
+        val KEY_CAMERA_BEARING_PREF = floatPreferencesKey("camera_bearing")
+        val KEY_NETWORK_MAP_LAYERS_PREF = stringSetPreferencesKey("network_map_layers")
+    }
+}

feature/map/src/google/kotlin/org/meshtastic/feature/map/repository/CustomTileProviderRepository.kt

@@ -0,0 +1,107 @@
+/*
+ * 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.feature.map.repository
+
+import co.touchlab.kermit.Logger
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import org.meshtastic.core.di.CoroutineDispatchers
+import org.meshtastic.core.repository.MapTileProviderPrefs
+import org.meshtastic.feature.map.model.CustomTileProviderConfig
+import javax.inject.Inject
+import javax.inject.Singleton
+
+interface CustomTileProviderRepository {
+    fun getCustomTileProviders(): Flow<List<CustomTileProviderConfig>>
+
+    suspend fun addCustomTileProvider(config: CustomTileProviderConfig)
+
+    suspend fun updateCustomTileProvider(config: CustomTileProviderConfig)
+
+    suspend fun deleteCustomTileProvider(configId: String)
+
+    suspend fun getCustomTileProviderById(configId: String): CustomTileProviderConfig?
+}
+
+@Singleton
+class CustomTileProviderRepositoryImpl
+@Inject
+constructor(
+    private val json: Json,
+    private val dispatchers: CoroutineDispatchers,
+    private val mapTileProviderPrefs: MapTileProviderPrefs,
+) : CustomTileProviderRepository {
+
+    private val customTileProvidersStateFlow = MutableStateFlow<List<CustomTileProviderConfig>>(emptyList())
+
+    init {
+        loadDataFromPrefs()
+    }
+
+    override fun getCustomTileProviders(): Flow<List<CustomTileProviderConfig>> =
+        customTileProvidersStateFlow.asStateFlow()
+
+    override suspend fun addCustomTileProvider(config: CustomTileProviderConfig) {
+        val newList = customTileProvidersStateFlow.value + config
+        customTileProvidersStateFlow.value = newList
+        saveDataToPrefs(newList)
+    }
+
+    override suspend fun updateCustomTileProvider(config: CustomTileProviderConfig) {
+        val newList = customTileProvidersStateFlow.value.map { if (it.id == config.id) config else it }
+        customTileProvidersStateFlow.value = newList
+        saveDataToPrefs(newList)
+    }
+
+    override suspend fun deleteCustomTileProvider(configId: String) {
+        val newList = customTileProvidersStateFlow.value.filterNot { it.id == configId }
+        customTileProvidersStateFlow.value = newList
+        saveDataToPrefs(newList)
+    }
+
+    override suspend fun getCustomTileProviderById(configId: String): CustomTileProviderConfig? =
+        customTileProvidersStateFlow.value.find { it.id == configId }
+
+    private fun loadDataFromPrefs() {
+        val jsonString = mapTileProviderPrefs.customTileProviders.value
+        if (jsonString != null) {
+            try {
+                customTileProvidersStateFlow.value = json.decodeFromString<List<CustomTileProviderConfig>>(jsonString)
+            } catch (e: SerializationException) {
+                Logger.e(e) { "Error deserializing tile providers" }
+                customTileProvidersStateFlow.value = emptyList()
+            }
+        } else {
+            customTileProvidersStateFlow.value = emptyList()
+        }
+    }
+
+    private suspend fun saveDataToPrefs(providers: List<CustomTileProviderConfig>) {
+        withContext(dispatchers.io) {
+            try {
+                val jsonString = json.encodeToString(providers)
+                mapTileProviderPrefs.setCustomTileProviders(jsonString)
+            } catch (e: SerializationException) {
+                Logger.e(e) { "Error serializing tile providers" }
+            }
+        }
+    }
+}

feature/map/src/testGoogle/kotlin/org/meshtastic/feature/map/MapViewModelTest.kt

@@ -38,16 +38,16 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.meshtastic.core.data.model.CustomTileProviderConfig
-import org.meshtastic.core.data.repository.CustomTileProviderRepository
 import org.meshtastic.core.datastore.UiPreferencesDataSource
 import org.meshtastic.core.model.ConnectionState
 import org.meshtastic.core.model.RadioController
-import org.meshtastic.core.prefs.map.GoogleMapsPrefs
 import org.meshtastic.core.repository.MapPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
 import org.meshtastic.core.repository.RadioConfigRepository
+import org.meshtastic.feature.map.model.CustomTileProviderConfig
+import org.meshtastic.feature.map.prefs.map.GoogleMapsPrefs
+import org.meshtastic.feature.map.repository.CustomTileProviderRepository
 import org.robolectric.RobolectricTestRunner
 
 @OptIn(ExperimentalCoroutinesApi::class)

feature/messaging/build.gradle.kts

@@ -25,7 +25,6 @@ plugins {
 configure<LibraryExtension> { namespace = "org.meshtastic.feature.messaging" }
 
 dependencies {
-    implementation(projects.core.analytics)
     implementation(projects.core.common)
     implementation(projects.core.data)
     implementation(projects.core.database)

feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/Message.kt

@@ -253,8 +253,9 @@ fun MessageScreen(
         if (hasUnreadMessages == true) {
             if (firstUnreadMessageUuid == null) return@LaunchedEffect // Wait for UUID query
 
-            if (firstUnreadIndex != null) {
-                val targetIndex = (firstUnreadIndex!! - (UnreadUiDefaults.VISIBLE_CONTEXT_COUNT - 1)).coerceAtLeast(0)
+            val index = firstUnreadIndex
+            if (index != null) {
+                val targetIndex = (index - (UnreadUiDefaults.VISIBLE_CONTEXT_COUNT - 1)).coerceAtLeast(0)
                 listState.smartScrollToIndex(coroutineScope = coroutineScope, targetIndex = targetIndex)
                 hasPerformedInitialScroll = true
             } else {

feature/node/detekt-baseline.xml

@@ -3,14 +3,10 @@
   <ManuallySuppressedIssues/>
   <CurrentIssues>
     <ID>CyclomaticComplexMethod:CompassViewModel.kt$CompassViewModel$@Suppress("ReturnCount") private fun calculatePositionalAccuracyMeters(): Float?</ID>
-    <ID>CyclomaticComplexMethod:DeviceMetrics.kt$@Suppress("LongMethod") @Composable private fun DeviceMetricsChart( modifier: Modifier = Modifier, telemetries: List&lt;Telemetry>, legendData: List&lt;LegendData>, vicoScrollState: VicoScrollState, selectedX: Double?, onPointSelected: (Double) -> Unit, )</ID>
     <ID>CyclomaticComplexMethod:NodeDetailActions.kt$NodeDetailActions$fun handleNodeMenuAction(scope: CoroutineScope, action: NodeMenuAction)</ID>
     <ID>CyclomaticComplexMethod:NodeDetailViewModel.kt$NodeDetailViewModel$fun handleNodeMenuAction(action: NodeMenuAction)</ID>
-    <ID>CyclomaticComplexMethod:PowerMetrics.kt$@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable private fun PowerMetricsCard(telemetry: Telemetry, isSelected: Boolean, onClick: () -> Unit)</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1000L</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1e-5</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1e-7</ID>
-    <ID>TooGenericExceptionCaught:PaxMetrics.kt$e: Exception</ID>
-    <ID>UnusedPrivateProperty:NodeDetailScreen.kt$val loadingMessage = stringResource(Res.string.loading)</ID>
   </CurrentIssues>
 </SmellBaseline>

feature/settings/detekt-baseline.xml

@@ -3,16 +3,10 @@
   <ManuallySuppressedIssues/>
   <CurrentIssues>
     <ID>CyclomaticComplexMethod:DisplayConfigItemList.kt$@Composable fun DisplayConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
-    <ID>CyclomaticComplexMethod:EditDeviceProfileDialog.kt$@Suppress("LongMethod") @OptIn(ExperimentalLayoutApi::class) @Composable fun EditDeviceProfileDialog( title: String, deviceProfile: DeviceProfile, onConfirm: (DeviceProfile) -> Unit, onDismiss: () -> Unit, modifier: Modifier = Modifier, )</ID>
     <ID>CyclomaticComplexMethod:ExternalNotificationConfigItemList.kt$@Suppress("LongMethod", "TooGenericExceptionCaught") @Composable fun ExternalNotificationConfigScreen( onBack: () -> Unit, modifier: Modifier = Modifier, viewModel: RadioConfigViewModel = hiltViewModel(), )</ID>
     <ID>CyclomaticComplexMethod:MQTTConfigItemList.kt$@Composable fun MQTTConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>CyclomaticComplexMethod:NetworkConfigItemList.kt$@Composable fun NetworkConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
-    <ID>CyclomaticComplexMethod:PositionConfigItemList.kt$@OptIn(ExperimentalPermissionsApi::class) @Composable fun PositionConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
-    <ID>CyclomaticComplexMethod:RadioConfigViewModel.kt$RadioConfigViewModel$fun installProfile(protobuf: DeviceProfile)</ID>
     <ID>CyclomaticComplexMethod:RadioConfigViewModel.kt$RadioConfigViewModel$private fun processPacketResponse(packet: MeshPacket)</ID>
-    <ID>CyclomaticComplexMethod:RadioConfigViewModel.kt$RadioConfigViewModel$private fun setRemoteModuleConfig(destNum: Int, config: ModuleConfig)</ID>
-    <ID>CyclomaticComplexMethod:SecurityConfigItemList.kt$@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun SecurityConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
-    <ID>LargeClass:RadioConfigViewModel.kt$RadioConfigViewModel : ViewModel</ID>
     <ID>LongMethod:AudioConfigItemList.kt$@Composable fun AudioConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:CannedMessageConfigItemList.kt$@Composable fun CannedMessageConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:DetectionSensorConfigItemList.kt$@Composable fun DetectionSensorConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
@@ -20,10 +14,8 @@
     <ID>LongMethod:DisplayConfigItemList.kt$@Composable fun DisplayConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:LoRaConfigItemList.kt$@Composable fun LoRaConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Unit)</ID>
     <ID>LongMethod:NetworkConfigItemList.kt$@Composable fun NetworkConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
-    <ID>LongMethod:PositionConfigItemList.kt$@OptIn(ExperimentalPermissionsApi::class) @Composable fun PositionConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:PowerConfigItemList.kt$@Composable fun PowerConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:RadioConfigViewModel.kt$RadioConfigViewModel$private fun processPacketResponse(packet: MeshPacket)</ID>
-    <ID>LongMethod:SecurityConfigItemList.kt$@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun SecurityConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:SerialConfigItemList.kt$@Composable fun SerialConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:StoreForwardConfigItemList.kt$@Composable fun StoreForwardConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
     <ID>LongMethod:TelemetryConfigItemList.kt$@Composable fun TelemetryConfigScreen(viewModel: RadioConfigViewModel = hiltViewModel(), onBack: () -> Unit)</ID>
@@ -36,13 +28,10 @@
     <ID>MagicNumber:EditDeviceProfileDialog.kt$ProfileField.FIXED_POSITION$6</ID>
     <ID>MagicNumber:EditDeviceProfileDialog.kt$ProfileField.MODULE_CONFIG$5</ID>
     <ID>MagicNumber:PacketResponseStateDialog.kt$100</ID>
-    <ID>NestedBlockDepth:RadioConfigViewModel.kt$RadioConfigViewModel$private fun processPacketResponse(packet: MeshPacket)</ID>
     <ID>ReturnCount:RadioConfigViewModel.kt$RadioConfigViewModel$private fun processPacketResponse(packet: MeshPacket)</ID>
     <ID>TooGenericExceptionCaught:DebugViewModel.kt$DebugViewModel$e: Exception</ID>
     <ID>TooGenericExceptionCaught:LanguageUtils.kt$LanguageUtils$e: Exception</ID>
     <ID>TooGenericExceptionCaught:RadioConfigViewModel.kt$RadioConfigViewModel$ex: Exception</ID>
     <ID>TooManyFunctions:RadioConfigViewModel.kt$RadioConfigViewModel : ViewModel</ID>
-    <ID>UnusedPrivateMember:RadioConfigViewModel.kt$RadioConfigViewModel$private fun setChannels(channelUrl: String)</ID>
-    <ID>UnusedPrivateProperty:SettingsViewModel.kt$SettingsViewModel$val capabilities = Capabilities(node.metadata?.firmware_version)</ID>
   </CurrentIssues>
 </SmellBaseline>

feature/settings/src/main/kotlin/org/meshtastic/feature/settings/SettingsViewModel.kt

@@ -31,6 +31,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okio.BufferedSink
+import okio.buffer
+import okio.sink
 import org.meshtastic.core.common.BuildConfigProvider
 import org.meshtastic.core.common.database.DatabaseManager
 import org.meshtastic.core.domain.usecase.settings.ExportDataUseCase
@@ -50,9 +53,8 @@ import org.meshtastic.core.repository.RadioConfigRepository
 import org.meshtastic.core.repository.UiPrefs
 import org.meshtastic.core.ui.viewmodel.stateInWhileSubscribed
 import org.meshtastic.proto.LocalConfig
-import java.io.BufferedWriter
 import java.io.FileNotFoundException
-import java.io.FileWriter
+import java.io.FileOutputStream
 import javax.inject.Inject
 
 @Suppress("LongParameterList", "TooManyFunctions")
@@ -176,12 +178,12 @@ constructor(
         }
     }
 
-    private suspend inline fun writeToUri(uri: Uri, crossinline block: suspend (BufferedWriter) -> Unit) {
+    private suspend inline fun writeToUri(uri: Uri, crossinline block: suspend (BufferedSink) -> Unit) {
         withContext(Dispatchers.IO) {
             try {
                 app.contentResolver.openFileDescriptor(uri, "wt")?.use { parcelFileDescriptor ->
-                    FileWriter(parcelFileDescriptor.fileDescriptor).use { fileWriter ->
-                        BufferedWriter(fileWriter).use { writer -> block.invoke(writer) }
+                    FileOutputStream(parcelFileDescriptor.fileDescriptor).sink().buffer().use { writer ->
+                        block.invoke(writer)
                     }
                 }
             } catch (ex: FileNotFoundException) {

feature/settings/src/main/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt

@@ -41,8 +41,10 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okio.buffer
+import okio.sink
+import okio.source
 import org.jetbrains.compose.resources.StringResource
-import org.meshtastic.core.data.repository.LocationRepository
 import org.meshtastic.core.domain.usecase.settings.AdminActionsUseCase
 import org.meshtastic.core.domain.usecase.settings.ExportProfileUseCase
 import org.meshtastic.core.domain.usecase.settings.ExportSecurityConfigUseCase
@@ -60,6 +62,7 @@ import org.meshtastic.core.model.Position
 import org.meshtastic.core.navigation.SettingsRoutes
 import org.meshtastic.core.repository.AnalyticsPrefs
 import org.meshtastic.core.repository.HomoglyphPrefs
+import org.meshtastic.core.repository.LocationRepository
 import org.meshtastic.core.repository.MapConsentPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository
@@ -450,7 +453,7 @@ constructor(
 
     fun importProfile(uri: Uri, onResult: (DeviceProfile) -> Unit) = viewModelScope.launch(Dispatchers.IO) {
         try {
-            app.contentResolver.openInputStream(uri)?.use { inputStream ->
+            app.contentResolver.openInputStream(uri)?.source()?.buffer()?.use { inputStream ->
                 importProfileUseCase(inputStream).onSuccess(onResult).onFailure { throw it }
             }
         } catch (ex: Exception) {
@@ -463,7 +466,7 @@ constructor(
         withContext(Dispatchers.IO) {
             try {
                 app.contentResolver.openFileDescriptor(uri, "wt")?.use { parcelFileDescriptor ->
-                    FileOutputStream(parcelFileDescriptor.fileDescriptor).use { outputStream ->
+                    FileOutputStream(parcelFileDescriptor.fileDescriptor).sink().buffer().use { outputStream ->
                         exportProfileUseCase(outputStream, profile)
                             .onSuccess { setResponseStateSuccess() }
                             .onFailure { throw it }
@@ -480,7 +483,7 @@ constructor(
         withContext(Dispatchers.IO) {
             try {
                 app.contentResolver.openFileDescriptor(uri, "wt")?.use { parcelFileDescriptor ->
-                    FileOutputStream(parcelFileDescriptor.fileDescriptor).use { outputStream ->
+                    FileOutputStream(parcelFileDescriptor.fileDescriptor).sink().buffer().use { outputStream ->
                         exportSecurityConfigUseCase(outputStream, securityConfig)
                             .onSuccess { setResponseStateSuccess() }
                             .onFailure { throw it }

feature/settings/src/test/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt

@@ -33,7 +33,6 @@ import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.meshtastic.core.data.repository.LocationRepository
 import org.meshtastic.core.domain.usecase.settings.AdminActionsUseCase
 import org.meshtastic.core.domain.usecase.settings.ExportProfileUseCase
 import org.meshtastic.core.domain.usecase.settings.ExportSecurityConfigUseCase
@@ -47,6 +46,7 @@ import org.meshtastic.core.domain.usecase.settings.ToggleHomoglyphEncodingUseCas
 import org.meshtastic.core.model.Node
 import org.meshtastic.core.repository.AnalyticsPrefs
 import org.meshtastic.core.repository.HomoglyphPrefs
+import org.meshtastic.core.repository.LocationRepository
 import org.meshtastic.core.repository.MapConsentPrefs
 import org.meshtastic.core.repository.NodeRepository
 import org.meshtastic.core.repository.PacketRepository