refactor: add shortName to traceroute response

closes #1164
meshtastic · Aug 18, 2024 · 3a11ca9 · 3a11ca9
1 parent ddad40a
commit 3a11ca9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -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))
                         })
                     }