mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
fix: import config missing data
This commit is contained in:
parent
7a01c4b228
commit
d71a9171ec
3 changed files with 4 additions and 4 deletions
|
|
@ -294,7 +294,7 @@ class RadioConfigViewModel @Inject constructor(
|
|||
}
|
||||
|
||||
private val _deviceProfile = MutableStateFlow<DeviceProfile?>(null)
|
||||
val deviceProfile get() = _deviceProfile.value
|
||||
val deviceProfile: StateFlow<DeviceProfile?> get() = _deviceProfile
|
||||
|
||||
fun setDeviceProfile(deviceProfile: DeviceProfile?) {
|
||||
_deviceProfile.value = deviceProfile
|
||||
|
|
@ -314,7 +314,7 @@ class RadioConfigViewModel @Inject constructor(
|
|||
}
|
||||
|
||||
fun exportProfile(uri: Uri) = viewModelScope.launch {
|
||||
val profile = deviceProfile ?: return@launch
|
||||
val profile = deviceProfile.value ?: return@launch
|
||||
writeToUri(uri, profile)
|
||||
_deviceProfile.value = null
|
||||
}
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ fun RadioConfigNavHost(
|
|||
val radioConfigState by viewModel.radioConfigState.collectAsStateWithLifecycle()
|
||||
var location by remember(node) { mutableStateOf(node?.position) } // FIXME
|
||||
|
||||
val deviceProfile by viewModel.deviceProfile.collectAsStateWithLifecycle()
|
||||
val isWaiting = radioConfigState.responseState !is ResponseState.Empty
|
||||
var showEditDeviceProfileDialog by remember { mutableStateOf(false) }
|
||||
|
||||
|
|
@ -254,7 +255,6 @@ fun RadioConfigNavHost(
|
|||
}
|
||||
}
|
||||
|
||||
val deviceProfile = viewModel.deviceProfile
|
||||
if (showEditDeviceProfileDialog) EditDeviceProfileDialog(
|
||||
title = if (deviceProfile != null) "Import configuration" else "Export configuration",
|
||||
deviceProfile = deviceProfile ?: viewModel.currentDeviceProfile,
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ fun <T> PacketResponseStateDialog(
|
|||
if (state.total == state.completed) onComplete()
|
||||
}
|
||||
if (state is ResponseState.Success) {
|
||||
Text("Delivery confirmed.")
|
||||
Text("Delivery confirmed")
|
||||
}
|
||||
if (state is ResponseState.Error) {
|
||||
Text(text = "Error\n", textAlign = TextAlign.Center)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue