mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-05-24 14:50:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): remote admin always showed local node config (#5560)

Browse Source 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
James Rich
2026-05-20 20:29:56 -07:00
committed by GitHub
parent 89311e1875
commit 41e368641b
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/navigation/SettingsNavigation.kt
View File

@@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.compose.dropUnlessResumed
import androidx.navigation3.runtime.EntryProviderScope
@@ -80,7 +79,7 @@ fun getRadioConfigViewModel(backStack: NavBackStack<NavKey>, destNumOverride: In
backStack.lastOrNull { it is SettingsRoute.Settings }?.let { (it as SettingsRoute.Settings).destNum }
}
return koinViewModel<RadioConfigViewModel>(key = destNum?.toString()) {
parametersOf(SavedStateHandle(mapOf("destNum" to destNum)))
parametersOf(destNum)
}
}

5
feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModel.kt
View File

@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import co.touchlab.kermit.Logger
@@ -115,7 +114,7 @@ data class RadioConfigState(
@KoinViewModel
@Suppress("LongParameterList")
open class RadioConfigViewModel(
@InjectedParam savedStateHandle: SavedStateHandle,
@InjectedParam private val destNum: Int?,
private val radioConfigRepository: RadioConfigRepository,
private val packetRepository: PacketRepository,
private val serviceRepository: ServiceRepository,
@@ -184,8 +183,6 @@ open class RadioConfigViewModel(
_mqttProbeStatus.value = null
}
private val destNum: Int? = savedStateHandle.get<Int>("destNum")
private val _destNode = MutableStateFlow<Node?>(null)
val destNode: StateFlow<Node?>
get() = _destNode

3
feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/ProfileRoundTripTest.kt
View File

@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
import androidx.lifecycle.SavedStateHandle
import dev.mokkery.MockMode
import dev.mokkery.answering.returns
import dev.mokkery.every
@@ -117,7 +116,7 @@ class ProfileRoundTripTest {
viewModel =
RadioConfigViewModel(
savedStateHandle = SavedStateHandle(),
destNum = null,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,

5
feature/settings/src/commonTest/kotlin/org/meshtastic/feature/settings/radio/RadioConfigViewModelTest.kt
View File

@@ -16,7 +16,6 @@
*/
package org.meshtastic.feature.settings.radio
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import dev.mokkery.MockMode
import dev.mokkery.answering.calls
@@ -140,7 +139,7 @@ class RadioConfigViewModelTest {
}
private fun createViewModel() = RadioConfigViewModel(
savedStateHandle = SavedStateHandle(),
destNum = null,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,
@@ -407,7 +406,7 @@ class RadioConfigViewModelTest {
nodeRepository.setNodes(listOf(node))
viewModel =
RadioConfigViewModel(
savedStateHandle = SavedStateHandle(mapOf("destNum" to 456)),
destNum = 456,
radioConfigRepository = radioConfigRepository,
packetRepository = packetRepository,
serviceRepository = serviceRepository,