From e2c377107cbe806a568606ab8f39e009e627f823 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Wed, 20 Mar 2024 08:40:32 -0300
Subject: [PATCH] refactor: improve NodeDB initialization

---
 app/src/main/java/com/geeksville/mesh/model/NodeDB.kt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
index fcb16ac07..5692b5dcb 100644
--- a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
@@ -47,8 +47,12 @@ class NodeDB @Inject constructor(
         nodeInfoDao.getMyNodeInfo().onEach { _myNodeInfo.value = it }
             .launchIn(processLifecycle.coroutineScope)
 
-        nodeInfoDao.nodeDBbyNum().onEach { _nodeDBbyNum.value = it }
-            .launchIn(processLifecycle.coroutineScope)
+        nodeInfoDao.nodeDBbyNum().onEach {
+            _nodeDBbyNum.value = it
+            val ourNodeInfo = it.values.firstOrNull()
+            _ourNodeInfo.value = ourNodeInfo
+            _myId.value = ourNodeInfo?.user?.id
+        }.launchIn(processLifecycle.coroutineScope)
 
         nodeInfoDao.nodeDBbyID().onEach { _nodeDBbyID.value = it }
             .launchIn(processLifecycle.coroutineScope)
@@ -67,8 +71,5 @@ class NodeDB @Inject constructor(
             setMyNodeInfo(mi) // set MyNodeInfo first
             putAll(nodes)
         }
-        val ourNodeInfo = nodes.find { it.num == mi.myNodeNum }
-        _ourNodeInfo.value = ourNodeInfo
-        _myId.value = ourNodeInfo?.user?.id
     }
 }