meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(config): move DeviceProfile data to local variable

Browse source
This commit is contained in:
andrekir 2024-10-17 07:03:01 -03:00 • committed by Andre K
parent d10b58073c
commit 85b0cda109
2 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt
View file

@ -326,19 +326,15 @@ class RadioConfigViewModel @Inject constructor(
fun removeFixedPosition() = setFixedPosition(Position(0.0, 0.0, 0))
private val _deviceProfile = MutableStateFlow<DeviceProfile?>(null)
val deviceProfile: StateFlow<DeviceProfile?> get() = _deviceProfile
fun setDeviceProfile(deviceProfile: DeviceProfile?) {
_deviceProfile.value = deviceProfile
}
fun importProfile(uri: Uri) = viewModelScope.launch(Dispatchers.IO) {
fun importProfile(
uri: Uri,
onResult: (DeviceProfile) -> Unit,
) = viewModelScope.launch(Dispatchers.IO) {
try {
app.contentResolver.openInputStream(uri).use { inputStream ->
val bytes = inputStream?.readBytes()
val protobuf = DeviceProfile.parseFrom(bytes)
_deviceProfile.value = protobuf
onResult(protobuf)
}
} catch (ex: Exception) {
errormsg("Import DeviceProfile error: ${ex.message}")
@ -346,10 +342,8 @@ class RadioConfigViewModel @Inject constructor(
}
}
fun exportProfile(uri: Uri) = viewModelScope.launch {
val profile = deviceProfile.value ?: return@launch
fun exportProfile(uri: Uri, profile: DeviceProfile) = viewModelScope.launch {
writeToUri(uri, profile)
_deviceProfile.value = null
}
private suspend fun writeToUri(uri: Uri, message: MessageLite) = withContext(Dispatchers.IO) {
@ -367,15 +361,17 @@ class RadioConfigViewModel @Inject constructor(
}
fun installProfile(protobuf: DeviceProfile) = with(protobuf) {
_deviceProfile.value = null
meshService?.beginEditSettings()
if (hasLongName() || hasShortName()) destNode.value?.user?.let {
val user = MeshProtos.User.newBuilder()
.setLongName(if (hasLongName()) longName else it.longName)
.setShortName(if (hasShortName()) shortName else it.shortName)
.setIsLicensed(it.isLicensed)
.build()
setOwner(user)
if (hasLongName() || hasShortName()) {
destNode.value?.user?.let {
val user = MeshProtos.User.newBuilder()
.setId(it.id)
.setLongName(if (hasLongName()) longName else it.longName)
.setShortName(if (hasShortName()) shortName else it.shortName)
.setIsLicensed(it.isLicensed)
.build()
setOwner(user)
}
}
if (hasChannelUrl()) try {
setChannels(channelUrl)

17
app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
View file

@ -59,6 +59,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile
import com.geeksville.mesh.Position
import com.geeksville.mesh.R
import com.geeksville.mesh.android.Logging
@ -544,7 +545,7 @@ fun RadioConfigScreen(
val isLocal = node?.num == viewModel.myNodeNum
val isWaiting = radioConfigState.responseState.isWaiting()
val deviceProfile by viewModel.deviceProfile.collectAsStateWithLifecycle()
var deviceProfile by remember { mutableStateOf<DeviceProfile?>(null) }
var showEditDeviceProfileDialog by remember { mutableStateOf(false) }
val importConfigLauncher = rememberLauncherForActivityResult(
@ -552,7 +553,9 @@ fun RadioConfigScreen(
) {
if (it.resultCode == Activity.RESULT_OK) {
showEditDeviceProfileDialog = true
it.data?.data?.let { uri -> viewModel.importProfile(uri) }
it.data?.data?.let { uri ->
viewModel.importProfile(uri) { profile -> deviceProfile = profile }
}
}
}
@ -560,7 +563,7 @@ fun RadioConfigScreen(
ActivityResultContracts.StartActivityForResult()
) {
if (it.resultCode == Activity.RESULT_OK) {
it.data?.data?.let { uri -> viewModel.exportProfile(uri) }
it.data?.data?.let { uri -> viewModel.exportProfile(uri, deviceProfile!!) }
}
}
@ -573,7 +576,7 @@ fun RadioConfigScreen(
if (deviceProfile != null) {
viewModel.installProfile(it)
} else {
viewModel.setDeviceProfile(it)
deviceProfile = it
val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "application/*"
@ -584,7 +587,7 @@ fun RadioConfigScreen(
},
onDismiss = {
showEditDeviceProfileDialog = false
viewModel.setDeviceProfile(null)
deviceProfile = null
}
)
}
@ -616,7 +619,7 @@ fun RadioConfigScreen(
},
onImport = {
viewModel.clearPacketResponse()
viewModel.setDeviceProfile(null)
deviceProfile = null
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "application/*"
@ -625,7 +628,7 @@ fun RadioConfigScreen(
},
onExport = {
viewModel.clearPacketResponse()
viewModel.setDeviceProfile(null)
deviceProfile = null
showEditDeviceProfileDialog = true
},
)