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

prevent concurrent modification exception when deleting old msgs

Browse source
This commit is contained in:
geeksville 2020-06-11 16:22:44 -07:00
parent e20f7c5943
commit 6baae70125
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -908,14 +908,20 @@ class MeshService : Service(), Logging {
offlineSentPackets.clear()
}
/**
* Change the status on a data packet and update watchers
*/
private fun changeStatus(p: DataPacket, m: MessageStatus) {
p.status = m
broadcastMessageStatus(p)
}
/**
* Handle an ack/nak packet by updating sent message status
*/
private fun handleAckNak(isAck: Boolean, id: Int) {
sentPackets.remove(id)?.let { p ->
p.status = if (isAck) MessageStatus.DELIVERED else MessageStatus.ERROR
broadcastMessageStatus(p)
changeStatus(p, if (isAck) MessageStatus.DELIVERED else MessageStatus.ERROR)
}
}
@ -1464,9 +1470,14 @@ class MeshService : Service(), Logging {
private fun deleteOldPackets() {
myNodeInfo?.apply {
val now = System.currentTimeMillis()
sentPackets.values.forEach { p ->
if (p.status == MessageStatus.ENROUTE && p.time + messageTimeoutMsec < now)
handleAckNak(false, p.id)
val old = sentPackets.values.filter { p ->
(p.status == MessageStatus.ENROUTE && p.time + messageTimeoutMsec < now)
}
// Do this using a separate list to prevent concurrent modification exceptions
old.forEach { p ->
handleAckNak(false, p.id)
}
}
}