From a6cfbcbfa7655f97586817a4a41e18862c3fef69 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 11 Sep 2024 19:04:18 -0300 Subject: [PATCH] refactor(saveMessagesCSV): use `nodeDBbyNum` map directly --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 6a40ff53c..1fb128638 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -560,7 +560,7 @@ class UIViewModel @Inject constructor( val myNodeNum = myNodeNum ?: return@launch // Capture the current node value while we're still on main thread - val nodes = nodeDB.nodes.value + val nodes = nodeDB.nodeDBbyNum.value val positionToPos: (MeshProtos.Position?) -> Position? = { meshPosition -> meshPosition?.let { Position(it) }.takeIf { @@ -569,8 +569,6 @@ class UIViewModel @Inject constructor( } writeToUri(uri) { writer -> - // Create a map of nodes keyed by their ID - val nodesById = nodes.values.associateBy { it.num }.toMutableMap() val nodePositions = mutableMapOf() writer.appendLine("\"date\",\"time\",\"from\",\"sender name\",\"sender lat\",\"sender long\",\"rx lat\",\"rx long\",\"rx elevation\",\"rx snr\",\"distance\",\"hop limit\",\"payload\"") @@ -599,7 +597,7 @@ class UIViewModel @Inject constructor( if (proto.rxSnr != 0.0f) { val rxDateTime = dateFormat.format(packet.received_date) val rxFrom = proto.from.toUInt() - val senderName = nodesById[proto.from]?.user?.longName ?: "" + val senderName = nodes[proto.from]?.user?.longName ?: "" // sender lat & long val senderPosition = nodePositions[proto.from]