From b0272e057896b473bf564161a6750599bceafd22 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 5 Feb 2024 23:48:23 -0800
Subject: [PATCH] Via MQTT

---
 Meshtastic/Persistence/UpdateCoreData.swift    |  1 +
 .../Views/Nodes/Helpers/NodeListItem.swift     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift
index 7f66989d..c94f73b6 100644
--- a/Meshtastic/Persistence/UpdateCoreData.swift
+++ b/Meshtastic/Persistence/UpdateCoreData.swift
@@ -279,6 +279,7 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext)
 					}
 					fetchedNode[0].snr = packet.rxSnr
 					fetchedNode[0].rssi = packet.rxRssi
+					fetchedNode[0].viaMqtt = packet.viaMqtt
 					fetchedNode[0].positions = mutablePositions.copy() as? NSOrderedSet
 
 					do {
diff --git a/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift
index a0faee9c..4dfb1af2 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift
@@ -89,14 +89,21 @@ struct NodeListItem: View {
 								}
 							}
 						}
-						if node.channel > 0 {
-							HStack {
+						HStack {
+							if node.channel > 0 {
 								Image(systemName: "fibrechannel")
 									.font(.callout)
 									.symbolRenderingMode(.hierarchical)
 								Text("Channel: \(node.channel)")
 									.font(.callout)
 							}
+							if node.viaMqtt && connectedNode != node.num {
+								Image(systemName: "network")
+									.symbolRenderingMode(.hierarchical)
+									.font(.callout)
+								Text("Via MQTT")
+									.font(.callout)
+							}
 						}
 						if !connected {
 							HStack {
@@ -129,13 +136,6 @@ struct NodeListItem: View {
 									.symbolRenderingMode(.hierarchical)
 									.font(.callout)
 							}
-							if node.viaMqtt {
-								Image(systemName: "network")
-									.symbolRenderingMode(.hierarchical)
-									.font(.callout)
-								Text("mqtt")
-									.font(.caption)
-							}
 						}
 						.padding(.top, 3)
 					}