mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

refactor: show nodes with unknown user info 

closes #912
pull/1048/head
andrekir 2024-05-19 06:45:03 -03:00
rodzic 309ace79b6
commit de3d74b979
1 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
Wyświetl plik

@ -397,9 +397,16 @@ class MeshService : Service(), Logging {
if (n == DataPacket.NODENUM_BROADCAST) DataPacket.ID_BROADCAST if (n == DataPacket.NODENUM_BROADCAST) DataPacket.ID_BROADCAST
else nodeDBbyNodeNum[n]?.user?.id ?: DataPacket.nodeNumToDefaultId(n) else nodeDBbyNodeNum[n]?.user?.id ?: DataPacket.nodeNumToDefaultId(n)
/// given a nodenum, return a db entry - creating if necessary // given a nodeNum, return a db entry - creating if necessary
private fun getOrCreateNodeInfo(n: Int) = private fun getOrCreateNodeInfo(n: Int) = nodeDBbyNodeNum.getOrPut(n) {
nodeDBbyNodeNum.getOrPut(n) { NodeInfo(n) } val defaultUser = MeshUser(
id = DataPacket.nodeNumToDefaultId(n),
longName = getString(R.string.unknown_username),
shortName = getString(R.string.unknown_node_short_name),
hwModel = MeshProtos.HardwareModel.UNSET,
)
NodeInfo(n, defaultUser)
}
private val hexIdRegex = """\!([0-9A-Fa-f]+)""".toRegex() private val hexIdRegex = """\!([0-9A-Fa-f]+)""".toRegex()
private val rangeTestRegex = Regex("seq (\\d{1,10})") private val rangeTestRegex = Regex("seq (\\d{1,10})")