From 37df3ce0842345483551b8598a53c0df40686993 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 12 May 2024 09:19:11 -0300 Subject: [PATCH] refactor: improve import feedback and use begin/commit transactions --- .../java/com/geeksville/mesh/model/RadioConfigViewModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt index 66c12309f..b90318af5 100644 --- a/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt @@ -322,13 +322,13 @@ class RadioConfigViewModel @Inject constructor( fun installProfile(protobuf: DeviceProfile) = with(protobuf) { _deviceProfile.value = null - // meshService?.beginEditSettings() + meshService?.beginEditSettings() if (hasLongName() || hasShortName()) destNode.value?.user?.let { val user = it.copy( longName = if (hasLongName()) longName else it.longName, shortName = if (hasShortName()) shortName else it.shortName ) - setOwner(user.toProto()) + if (it != user) setOwner(user.toProto()) } if (hasChannelUrl()) try { setChannels(channelUrl) @@ -360,8 +360,7 @@ class RadioConfigViewModel @Inject constructor( setModuleConfig(moduleConfig { detectionSensor = it.detectionSensor }) setModuleConfig(moduleConfig { paxcounter = it.paxcounter }) } - setResponseStateSuccess() - // meshService?.commitEditSettings() + meshService?.commitEditSettings() } fun clearPacketResponse() {