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

fix: packet response requestId tracking

Browse source 
fixes #794
This commit is contained in:
andrekir 2023-12-13 19:29:06 -03:00
parent 425763627d
commit 391a8be499
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,10 @@ class RadioConfigViewModel @Inject constructor(
val total = maxOf(requestIds.value.size, state.responseState.total)
state.copy(responseState = state.responseState.copy(total = total))
} else {
state.copy(responseState = ResponseState.Loading())
state.copy(
route = "", // setter (response is PortNum.ROUTING_APP)
responseState = ResponseState.Loading(),
)
}
}
} catch (ex: RemoteException) {
@ -410,7 +413,7 @@ class RadioConfigViewModel @Inject constructor(
private fun processPacketResponse(log: MeshLog?) {
val packet = log?.meshPacket ?: return
val data = packet.decoded
requestIds.update { it.apply { put(data.requestId, true) } }
val route = radioConfigState.value.route
// val destNum = destNode.value?.num ?: return
val debugMsg =
@ -421,7 +424,8 @@ class RadioConfigViewModel @Inject constructor(
debug(debugMsg.format(parsed.errorReason.name))
if (parsed.errorReason != MeshProtos.Routing.Error.NONE) {
setResponseStateError(parsed.errorReason.name)
} else if (packet.from == destNum) {
} else if (packet.from == destNum && route.isEmpty()) {
requestIds.update { it.apply { put(data.requestId, true) } }
if (requestIds.value.filterValues { !it }.isEmpty()) setResponseStateSuccess()
else incrementCompleted()
}
@ -434,7 +438,7 @@ class RadioConfigViewModel @Inject constructor(
return
}
// check if destination is channel editor
val goChannels = radioConfigState.value.route == ConfigRoute.CHANNELS.name
val goChannels = route == ConfigRoute.CHANNELS.name
when (parsed.payloadVariantCase) {
AdminProtos.AdminMessage.PayloadVariantCase.GET_CHANNEL_RESPONSE -> {
val response = parsed.getChannelResponse
@ -493,6 +497,7 @@ class RadioConfigViewModel @Inject constructor(
else -> TODO()
}
requestIds.update { it.apply { put(data.requestId, true) } }
}
}
}