From 02af81aeb00c45b5d889c5a37e60f728eba60fed Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Fri, 15 Nov 2024 06:46:37 -0300
Subject: [PATCH] fix: nodelist sort by `viaMqtt`

---
 .../main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt | 2 +-
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt  | 4 ++--
 2 files changed, 3 insertions(+), 3 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 b7a568f42..b8361ee32 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
@@ -69,7 +69,7 @@ interface NodeInfoDao {
                 ELSE hops_away
             END
         WHEN :sort = 'channel' THEN channel
-        WHEN :sort = 'via_mqtt' THEN long_name LIKE '%(MQTT)' -- viaMqtt
+        WHEN :sort = 'via_mqtt' THEN via_mqtt
         ELSE 0
     END ASC,
     last_heard DESC
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 d1bee8d84..a191f1258 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1394,8 +1394,8 @@ class MeshService : Service(), Logging {
                     if (isLicensed) clearPublicKey()
                     if (info.viaMqtt) longName = "$longName (MQTT)"
                 }
-                it.longName = info.user.longName
-                it.shortName = info.user.shortName
+                it.longName = it.user.longName
+                it.shortName = it.user.shortName
             }
 
             if (info.hasPosition()) {