mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-29 19:23:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

don't generate redundant set User packets

Browse Source
This commit is contained in:
geeksville
2020-06-13 16:02:57 -07:00
parent 68ed9d5333
commit 7ee4aff64c
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -893,6 +893,7 @@ class MeshService : Service(), Logging {
val packet = toMeshPacket(p)
p.status = MessageStatus.ENROUTE
p.time = System.currentTimeMillis() // update time to the actual time we started sending
debug("SENDING TO RADIO: $packet")
sendToRadio(packet)
}
@@ -934,7 +935,7 @@ class MeshService : Service(), Logging {
// decided to pass through to us (except for broadcast packets)
//val toNum = packet.to
debug("Recieved: $packet")
// debug("Recieved: $packet")
val p = packet.decoded
// If the rxTime was not set by the device (because device software was old), guess at a time
@@ -1370,24 +1371,34 @@ class MeshService : Service(), Logging {
* Set our owner with either the new or old API
*/
fun setOwner(myId: String?, longName: String, shortName: String) {
debug("SetOwner $myId : ${longName.anonymize} : $shortName")
val myNode = myNodeInfo
if (myNode != null) {
val user = MeshProtos.User.newBuilder().also {
if (myId != null) // Only set the id if it was provided
it.id = myId
it.longName = longName
it.shortName = shortName
}.build()
// Also update our own map for our nodenum, by handling the packet just like packets from other users
if (myNodeInfo != null) {
handleReceivedUser(myNodeInfo!!.myNodeNum, user)
}
val myInfo = toNodeInfo(myNode.myNodeNum)
if (longName == myInfo.user?.longName && shortName == myInfo.user?.shortName)
debug("Ignoring nop owner change")
else {
debug("SetOwner $myId : ${longName.anonymize} : $shortName")
// set my owner info
sendToRadio(ToRadio.newBuilder().apply {
this.setOwner = user
})
val user = MeshProtos.User.newBuilder().also {
if (myId != null) // Only set the id if it was provided
it.id = myId
it.longName = longName
it.shortName = shortName
}.build()
// Also update our own map for our nodenum, by handling the packet just like packets from other users
handleReceivedUser(myNode.myNodeNum, user)
// set my owner info
sendToRadio(ToRadio.newBuilder().apply {
this.setOwner = user
})
}
} else
throw Exception("Can't set user without a node info") // this shouldn't happen
}
/// Do not use directly, instead call generatePacketId()