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: improve PKI message routing and resolve database migration racecondition (#4996)

Browse source
This commit is contained in:
James Rich 2026-04-04 19:37:20 -05:00 • committed by GitHub
parent d0e3b682ab
commit b3be9e2c38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 277 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/model/src/commonMain/kotlin/org/meshtastic/core/model/Message.kt
View file

@ -21,10 +21,12 @@ import org.meshtastic.core.resources.Res
import org.meshtastic.core.resources.delivery_confirmed
import org.meshtastic.core.resources.error
import org.meshtastic.core.resources.message_delivery_status
import org.meshtastic.core.resources.message_status_delivered
import org.meshtastic.core.resources.message_status_enroute
import org.meshtastic.core.resources.message_status_queued
import org.meshtastic.core.resources.message_status_sfpp_confirmed
import org.meshtastic.core.resources.message_status_sfpp_routing
import org.meshtastic.core.resources.message_status_unknown
import org.meshtastic.core.resources.routing_error_admin_bad_session_key
import org.meshtastic.core.resources.routing_error_admin_public_key_unauthorized
import org.meshtastic.core.resources.routing_error_bad_request
@ -103,7 +105,11 @@ data class Message(
MessageStatus.ENROUTE -> Res.string.message_status_enroute
MessageStatus.SFPP_ROUTING -> Res.string.message_status_sfpp_routing
MessageStatus.SFPP_CONFIRMED -> Res.string.message_status_sfpp_confirmed
else -> getStringResFrom(routingError)
MessageStatus.DELIVERED -> Res.string.message_status_delivered
MessageStatus.ERROR -> getStringResFrom(routingError)
MessageStatus.UNKNOWN,
null,
-> Res.string.message_status_unknown
}
return title to text
}