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

refactor: add shortName to traceroute response

Browse source 
closes #1164
This commit is contained in:
andrekir 2024-08-18 09:34:47 -03:00
parent ddad40a969
commit 3a11ca9a1c
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -442,8 +442,12 @@ class MeshService : Service(), Logging {
}
}
private fun getLongName(num: Int) =
nodeDBbyNodeNum[num]?.user?.longName ?: getString(R.string.unknown_username)
private fun getUserName(num: Int): String {
val user = nodeDBbyNodeNum[num]?.user
val longName = user?.longName ?: getString(R.string.unknown_username)
val shortName = user?.shortName ?: DataPacket.nodeNumToDefaultId(num)
return "$longName ($shortName)"
}
private val numNodes get() = nodeDBbyNodeNum.size
@ -733,9 +737,9 @@ class MeshService : Service(), Logging {
if (data.wantResponse) return // ignore data from traceroute requests
val parsed = MeshProtos.RouteDiscovery.parseFrom(data.payload)
radioConfigRepository.setTracerouteResponse(buildString {
append("${getLongName(packet.to)} --> ")
parsed.routeList.forEach { num -> append("${getLongName(num)} --> ") }
append(getLongName(packet.from))
append("${getUserName(packet.to)} --> ")
parsed.routeList.forEach { num -> append("${getUserName(num)} --> ") }
append(getUserName(packet.from))
})
}