From de3d74b979848b9bd6667e032c161dd9d971d69f Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 19 May 2024 06:45:03 -0300 Subject: [PATCH] refactor: show nodes with unknown user info closes #912 --- .../java/com/geeksville/mesh/service/MeshService.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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 index cab8a51a0..e47c8aefd 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -397,9 +397,16 @@ class MeshService : Service(), Logging { if (n == DataPacket.NODENUM_BROADCAST) DataPacket.ID_BROADCAST else nodeDBbyNodeNum[n]?.user?.id ?: DataPacket.nodeNumToDefaultId(n) - /// given a nodenum, return a db entry - creating if necessary - private fun getOrCreateNodeInfo(n: Int) = - nodeDBbyNodeNum.getOrPut(n) { NodeInfo(n) } + // given a nodeNum, return a db entry - creating if necessary + private fun getOrCreateNodeInfo(n: Int) = nodeDBbyNodeNum.getOrPut(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 rangeTestRegex = Regex("seq (\\d{1,10})")