Only show logs when there is data. Move coredata extentions. Allow turning off of mqtt client proxy. Save unread message badges on configcomplete

Meshtastic.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		C9697F9D279336B700250207 /* LocalMBTileOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9697F9C279336B700250207 /* LocalMBTileOverlay.swift */; };
 		C9697FA527933B8C00250207 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = C9697FA427933B8C00250207 /* SQLite */; };
 		DD007BAE2AA4E91200F5FA12 /* MyInfoEntityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD007BAD2AA4E91200F5FA12 /* MyInfoEntityExtension.swift */; };
+		DD007BB02AA5981000F5FA12 /* NodeInfoEntityExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD007BAF2AA5981000F5FA12 /* NodeInfoEntityExtension.swift */; };
 		DD0D3D222A55CEB10066DB71 /* CocoaMQTT in Frameworks */ = {isa = PBXBuildFile; productRef = DD0D3D212A55CEB10066DB71 /* CocoaMQTT */; };
 		DD0F791B28713C8A00A6FDAD /* AdminMessageList.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0F791A28713C8A00A6FDAD /* AdminMessageList.swift */; };
 		DD14E72E2A82A614006E39BC /* RemoteHardware.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD14E72D2A82A614006E39BC /* RemoteHardware.swift */; };
@@ -209,6 +210,7 @@
 		A65FA974296876BF00A97686 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		C9697F9C279336B700250207 /* LocalMBTileOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalMBTileOverlay.swift; sourceTree = "<group>"; };
 		DD007BAD2AA4E91200F5FA12 /* MyInfoEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyInfoEntityExtension.swift; sourceTree = "<group>"; };
+		DD007BAF2AA5981000F5FA12 /* NodeInfoEntityExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeInfoEntityExtension.swift; sourceTree = "<group>"; };
 		DD0E9C222A30CE3A00580CBB /* MeshtasticDataModelV14.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV14.xcdatamodel; sourceTree = "<group>"; };
 		DD0F791A28713C8A00A6FDAD /* AdminMessageList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminMessageList.swift; sourceTree = "<group>"; };
 		DD14E72C2A80738F006E39BC /* MeshtasticDataModelV15.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV15.xcdatamodel; sourceTree = "<group>"; };
@@ -439,6 +441,20 @@
 			path = Custom;
 			sourceTree = "<group>";
 		};
+		DD007BB12AA59B9A00F5FA12 /* CoreData */ = {
+			isa = PBXGroup;
+			children = (
+				DD58C5F12919AD3C00D5BEFB /* ChannelEntityExtension.swift */,
+				6DEDA55B2A9592F900321D2E /* MessageEntityExtension.swift */,
+				DD007BAD2AA4E91200F5FA12 /* MyInfoEntityExtension.swift */,
+				DD007BAF2AA5981000F5FA12 /* NodeInfoEntityExtension.swift */,
+				DD5394FD276BA0EF00AD86B1 /* PositionEntityExtension.swift */,
+				DDD9E4E3284B208E003777C5 /* UserEntityExtension.swift */,
+				DD964FC1297272AE007C176F /* WaypointEntityExtension.swift */,
+			);
+			path = CoreData;
+			sourceTree = "<group>";
+		};
 		DD47E3CA26F0E50300029299 /* Nodes */ = {
 			isa = PBXGroup;
 			children = (
@@ -759,15 +775,9 @@
 		DDC4D5662754996200A4208E /* Persistence */ = {
 			isa = PBXGroup;
 			children = (
-				DD58C5F12919AD3C00D5BEFB /* ChannelEntityExtension.swift */,
-				6DEDA55B2A9592F900321D2E /* MessageEntityExtension.swift */,
-				DD007BAD2AA4E91200F5FA12 /* MyInfoEntityExtension.swift */,
 				DDC4D567275499A500A4208E /* Persistence.swift */,
-				DD5394FD276BA0EF00AD86B1 /* PositionEntityExtension.swift */,
 				DD964FC52975DBFD007C176F /* QueryCoreData.swift */,
 				DD3CC6C128EB9D4900FA9159 /* UpdateCoreData.swift */,
-				DDD9E4E3284B208E003777C5 /* UserEntityExtension.swift */,
-				DD964FC1297272AE007C176F /* WaypointEntityExtension.swift */,
 			);
 			path = Persistence;
 			sourceTree = "<group>";
@@ -783,6 +793,7 @@
 		DDDB443E29F79A9400EE2349 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				DD007BB12AA59B9A00F5FA12 /* CoreData */,
 				DDDB444529F8A96500EE2349 /* Character.swift */,
 				DDDB444929F8AA3A00EE2349 /* CLLocationCoordinate2D.swift */,
 				DDDB444B29F8AAA600EE2349 /* Color.swift */,
@@ -1085,6 +1096,7 @@
 				DDB6ABE628B1406100384BA1 /* LoraConfigEnums.swift in Sources */,
 				DDB8F4142A9EE5F000230ECE /* ChannelList.swift in Sources */,
 				DDD43FE32A78C8900083A3E9 /* MqttClientProxyManager.swift in Sources */,
+				DD007BB02AA5981000F5FA12 /* NodeInfoEntityExtension.swift in Sources */,
 				DDDB444629F8A96500EE2349 /* Character.swift in Sources */,
 				DD23A50F26FD1B4400D9B90C /* PeripheralModel.swift in Sources */,
 				DDB6ABDB28B0AC6000384BA1 /* DistanceText.swift in Sources */,

Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift

@@ -0,0 +1,27 @@
+//
+//  NodeInfoEntityExtension.swift
+//  Meshtastic
+//
+//  Copyright(c) Garth Vander Houwen 9/3/23.
+//
+
+import Foundation
+
+extension NodeInfoEntity {
+	
+	var hasPositions: Bool {
+		return positions?.count ?? 0 > 0
+	}
+	
+	var hasDeviceMetrics: Bool {
+
+		let deviceMetrics = telemetries?.filter{ ($0 as AnyObject).metricsType == 0 }
+		return deviceMetrics?.count ?? 0 > 0
+	}
+	
+	var hasEnvironmentMetrics: Bool {
+
+		let environmentMetrics = telemetries?.filter{ ($0 as AnyObject).metricsType == 1 }
+		return environmentMetrics?.count ?? 0 > 0
+	}
+}

Meshtastic/Helpers/BLEManager.swift

@@ -613,16 +613,20 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 					fetchNodeInfoRequest.predicate = NSPredicate(format: "num == %lld", Int64(connectedPeripheral.num))
 					do {
 						let fetchedNodeInfo = try context?.fetch(fetchNodeInfoRequest) as? [NodeInfoEntity] ?? []
-						if fetchedNodeInfo.count == 1 && fetchedNodeInfo[0].mqttConfig != nil {
+						if fetchedNodeInfo.count == 1 {
 							// Subscribe to Mqtt Client Proxy if enabled
-							if fetchedNodeInfo[0].mqttConfig?.enabled ?? false && fetchedNodeInfo[0].mqttConfig?.proxyToClientEnabled ?? false {
+							if fetchedNodeInfo[0].mqttConfig != nil && fetchedNodeInfo[0].mqttConfig?.enabled ?? false && fetchedNodeInfo[0].mqttConfig?.proxyToClientEnabled ?? false {
 								mqttManager.connectFromConfigSettings(node: fetchedNodeInfo[0])
+							} else {
+								if mqttProxyConnected {
+									mqttManager.mqttClientProxy?.disconnect()
+								}
 							}
 							// Set initial unread message badge states
-							var appState = AppState.shared
+							let appState = AppState.shared
 							appState.unreadChannelMessages = fetchedNodeInfo[0].myInfo?.unreadMessages ?? 0
 							appState.unreadDirectMessages = fetchedNodeInfo[0].user?.unreadMessages ?? 0
-							appState.connectedNode = fetchedNodeInfo[0]
+							//appState.connectedNode = fetchedNodeInfo[0]
 							UIApplication.shared.applicationIconBadgeNumber = appState.unreadChannelMessages + appState.unreadDirectMessages
 							
 						}

Meshtastic/Views/Helpers/Node/NodeInfoView.swift

@@ -58,8 +58,9 @@ struct NodeInfoView: View {
 					}
 					Divider()
 				}
-				let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0"))
-				if deviceMetrics?.count ?? 0 >= 1 {
+				
+				if node.hasDeviceMetrics {
+					let deviceMetrics = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0"))
 					let mostRecent = deviceMetrics?.lastObject as? TelemetryEntity
 					VStack(alignment: .center) {
 						BatteryGauge(batteryLevel: Double(mostRecent?.batteryLevel ?? 0))
@@ -196,7 +197,7 @@ struct NodeInfoView: View {
 
 		VStack {
 
-			if (node.positions?.count ?? 0) > 0 {
+			if node.hasPositions{
 
 				NavigationLink {
 					PositionLog(node: node)
@@ -213,20 +214,22 @@ struct NodeInfoView: View {
 				Divider()
 			}
 
-			if (node.telemetries?.count ?? 0) > 0 {
-
+			if node.hasDeviceMetrics {
+				
 				NavigationLink {
 					DeviceMetricsLog(node: node)
 				} label: {
-
+					
 					Image(systemName: "flipphone")
 						.symbolRenderingMode(.hierarchical)
 						.font(.title)
-
+					
 					Text("Device Metrics Log")
 						.font(.title3)
 				}
 				Divider()
+			}
+			if node.hasEnvironmentMetrics {
 				NavigationLink {
 					EnvironmentMetricsLog(node: node)
 				} label: {

Meshtastic/Views/Nodes/NodeDetail.swift

@@ -55,7 +55,7 @@ struct NodeDetail: View {
 		NavigationStack {
 			GeometryReader { bounds in
 				VStack {
-					if node.positions?.count ?? 0 > 0 {
+					if node.hasPositions {
 						ZStack {
 							let positionArray = node.positions?.array as? [PositionEntity] ?? []
 							let lastTenThousand = Array(positionArray.prefix(10000))
@@ -232,7 +232,7 @@ struct NodeDetail: View {
 				.task(id: node.num) {
 					if !loadedWeather {
 						do {
-							if node.positions?.count ?? 0 > 0 {
+							if node.hasPositions {
 								let mostRecent = node.positions?.lastObject as? PositionEntity
 								let weather = try await WeatherService.shared.weather(for: mostRecent?.nodeLocation ?? CLLocation(latitude: LocationHelper.currentLocation.latitude, longitude: LocationHelper.currentLocation.longitude))
 								condition = weather.currentWeather.condition