From cb7ef639c0906d48b4fe2627c2955e9b86072987 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 31 Mar 2024 16:45:07 -0300
Subject: [PATCH] refactor: sort node list by `lastHeard` in database query

---
 .../main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt | 2 +-
 app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
index 01d1683e5..01ca864a4 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
@@ -25,7 +25,7 @@ interface NodeInfoDao {
     @Query("SELECT * FROM NodeInfo")
     fun getNodes(): Flow<List<NodeInfo>>
 
-    @Query("SELECT * FROM NodeInfo ORDER BY CASE WHEN num = (SELECT myNodeNum FROM MyNodeInfo LIMIT 1) THEN 0 ELSE 1 END, num ASC")
+    @Query("SELECT * FROM NodeInfo ORDER BY CASE WHEN num = (SELECT myNodeNum FROM MyNodeInfo LIMIT 1) THEN 0 ELSE 1 END, lastHeard DESC")
     fun nodeDBbyNum(): Flow<Map<@MapColumn(columnName = "num") Int, NodeInfo>>
 
     @Query("SELECT * FROM NodeInfo")
diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index 588d46d84..01cd8dd02 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -222,10 +222,6 @@ class UsersFragment : ScreenFragment("Users"), Logging {
                 return
             }
 
-            if (nodesIn.size > 1) {
-                nodesIn.sortWith(compareByDescending { it.lastHeard }, 1)
-            }
-
             val previousNodes = nodes
 
             if (nodesIn.size < previousNodes.size) {