From cf2315cb664099073aab163f9ebe0fe39940af83 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Fri, 11 Oct 2024 05:54:06 -0500 Subject: [PATCH] Sort nodes with unknown hops last (#1302) Nodes with -1 hops (unknown) are now sorted last when sorting by hops_away. This ensures a more intuitive ordering in the UI. --- .../java/com/geeksville/mesh/database/dao/NodeInfoDao.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 7fe9469ec..b7a568f42 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 @@ -63,7 +63,11 @@ interface NodeInfoDao { (longitude - (SELECT longitude FROM OurNode)) * (longitude - (SELECT longitude FROM OurNode)) END - WHEN :sort = 'hops_away' THEN hops_away + WHEN :sort = 'hops_away' THEN + CASE + WHEN hops_away = -1 THEN 999999999 + ELSE hops_away + END WHEN :sort = 'channel' THEN channel WHEN :sort = 'via_mqtt' THEN long_name LIKE '%(MQTT)' -- viaMqtt ELSE 0