2.7.6 Working Changes

Localizable.xcstrings

@@ -3905,10 +3905,6 @@
         }
       }
     },
-    "Anonymous Usage and Crash data" : {
-      "comment" : "A description of how the app collects and uses data about its usage and crashes. It emphasizes that this data is anonymous and non-personally identifiable.",
-      "isCommentAutoGenerated" : true
-    },
     "Any missed messages will be delivered again." : {
       "localizations" : {
         "it" : {
@@ -20930,6 +20926,10 @@
         }
       }
     },
+    "Meshtastic does not collect any personal information. We do anonymously collect usage and crash data to improve the app. You can opt out under app settings." : {
+      "comment" : "A description of Meshtastic's data collection practices.",
+      "isCommentAutoGenerated" : true
+    },
     "Meshtastic Node %@ has shared channels with you" : {
       "localizations" : {
         "de" : {
@@ -40176,6 +40176,9 @@
           }
         }
       }
+    },
+    "User Privacy" : {
+
     },
     "User Uploaded" : {
       "comment" : "Data source label for user uploaded files",
@@ -41040,10 +41043,6 @@
     },
     "Waypoints" : {
 
-    },
-    "We anonymously collect usage and crash data to improve the app. This helps us understand how the app is being used and where we can make improvements. The data we collect is non-personally identifiable and cannot be linked to you as an individual. You can opt out of this under app settings." : {
-      "comment" : "A description of how the app collects and uses user data. Includes a link to the app settings.",
-      "isCommentAutoGenerated" : true
     },
     "Weather Conditions" : {
       "localizations" : {

Meshtastic.xcodeproj/project.pbxproj

@@ -2094,7 +2094,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 2.7.5;
+				MARKETING_VERSION = 2.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -2129,7 +2129,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 2.7.5;
+				MARKETING_VERSION = 2.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -2161,7 +2161,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 2.7.5;
+				MARKETING_VERSION = 2.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2194,7 +2194,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.6;
-				MARKETING_VERSION = 2.7.5;
+				MARKETING_VERSION = 2.7.6;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Meshtastic/Accessory/Accessory Manager/AccessoryManager+FromRadio.swift

@@ -106,8 +106,11 @@ extension AccessoryManager {
 			return
 		}
 
+		// Check if we're in database retrieval mode to defer saves for performance
+		let isRetrievingDatabase = if case .retrievingDatabase = self.state { true } else { false }
+
 		// TODO: nodeInfoPacket's channel: parameter is not used
-		if let nodeInfo = nodeInfoPacket(nodeInfo: nodeInfo, channel: 0, context: context) {
+		if let nodeInfo = nodeInfoPacket(nodeInfo: nodeInfo, channel: 0, context: context, deferSave: isRetrievingDatabase) {
 			if let activeDevice = activeConnection?.device, activeDevice.num == nodeInfo.num {
 				if let user = nodeInfo.user {
 					updateDevice(deviceId: activeDevice.id, key: \.shortName, value: user.shortName ?? "?")

Meshtastic/Accessory/Accessory Manager/AccessoryManager+MQTT.swift

@@ -32,8 +32,8 @@ extension AccessoryManager {
 					}
 				}
 				// Set initial unread message badge states
-				appState.unreadChannelMessages = fetchedNodeInfo[0].myInfo?.unreadMessages ?? 0
-				appState.unreadDirectMessages = fetchedNodeInfo[0].user?.unreadMessages ?? 0
+				appState.unreadChannelMessages = fetchedNodeInfo[0].myInfo?.unreadMessages(context: context) ?? 0
+				appState.unreadDirectMessages = fetchedNodeInfo[0].user?.unreadMessages(context: context, skipLastMessageCheck: true) ?? 0 // skipLastMessageCheck=true because we don't update lastMessage on our own connected node
 			}
 			if fetchedNodeInfo.count == 1 && fetchedNodeInfo[0].rangeTestConfig?.enabled == true {
 				wantRangeTestPackets = true

Meshtastic/Accessory/Accessory Manager/AccessoryManager.swift

@@ -665,6 +665,17 @@ class AccessoryManager: ObservableObject, MqttClientProxyManagerDelegate {
 					self.firstDatabaseNodeInfoContinuation = nil
 				}
 
+				// Perform a single batch save after database retrieval completes
+				// This significantly improves performance on reconnect
+				do {
+					try context.save()
+					Logger.data.info("💾 [Database] Batch saved all node info after database retrieval")
+				} catch {
+					context.rollback()
+					let nsError = error as NSError
+					Logger.data.error("💥 [Database] Error saving batch node info: \(nsError, privacy: .public)")
+				}
+
 			default:
 				Logger.transport.error("[Accessory] Unknown nonce completed: \(configCompleteID)")
 			}

Meshtastic/Accessory/Protocols/Device.swift

@@ -23,7 +23,10 @@ struct Device: Identifiable, Hashable {
 
 	var connectionState: ConnectionState
 	var wasRestored: Bool = false
-	init(id: UUID, name: String, transportType: TransportType, identifier: String, connectionState: ConnectionState = .disconnected, rssi: Int? = nil, num: Int64? = nil, wasRestored: Bool = false) {
+
+	var connectionDetails: String?
+
+	init(id: UUID, name: String, transportType: TransportType, identifier: String, connectionState: ConnectionState = .disconnected, rssi: Int? = nil, num: Int64? = nil, connectionDetails: String? = nil, wasRestored: Bool = false) {
 		self.id = id
 		self.name = name
 		self.transportType = transportType
@@ -32,6 +35,7 @@ struct Device: Identifiable, Hashable {
 		self.rssi = rssi
 		self.num = num
 		self.wasRestored = wasRestored
+		self.connectionDetails = connectionDetails
 	}
 
 	var rssiString: String {

Meshtastic/Accessory/Transports/TCP/TCPTransport.swift

@@ -78,10 +78,27 @@ class TCPTransport: NSObject, Transport, NetServiceBrowserDelegate, NetServiceDe
 		// Save the resolved service locally for later
 		services[service.name] = ResolvedService(id: idString, service: service, host: host, port: port)
 
+		let name: String
+		if let txtRecords = service.txtRecordData().map({NetService.dictionary(fromTXTRecord: $0)}) {
+			var nodeNameString = ""
+			if let shortNameData = txtRecords["shortname"] {
+				nodeNameString += String(decoding: shortNameData, as: UTF8.self)
+			}
+			if let nodeId = txtRecords["id"], nodeId.count > 4 {
+				if nodeNameString.count > 0 {
+					nodeNameString += "_"
+				}
+				nodeNameString += String(decoding: nodeId.suffix(4), as: UTF8.self)
+			}
+			name = nodeNameString
+		} else {
+			name = "\(service.name) (\(ip))"
+		}
 		let device = Device(id: idString,
-							name: "\(service.name) (\(ip))",
+							name: name,
 							transportType: .tcp,
-							identifier: "\(host):\(port)")
+							identifier: "\(host):\(port)",
+							connectionDetails: "\(ip):\(port)")
 		continuation?.yield(.deviceFound(device))
 	}
 

Meshtastic/Extensions/CoreData/ChannelEntityExtension.swift

@@ -9,22 +9,46 @@ import CoreData
 import MeshtasticProtobufs
 
 extension ChannelEntity {
+	var messagePredicate: NSPredicate {
+		return NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
+	}
 
-	var allPrivateMessages: [MessageEntity] {
-		let context = PersistenceController.shared.container.viewContext
+	var messageFetchRequest: NSFetchRequest<MessageEntity> {
 		let fetchRequest = MessageEntity.fetchRequest()
 		fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
-		fetchRequest.predicate = NSPredicate(format: "channel == %ld AND toUser == nil AND isEmoji == false", self.index)
+		fetchRequest.predicate = messagePredicate
+		return fetchRequest
+	}
+
+	var allPrivateMessages: [MessageEntity] {
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
 
 		return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
 	}
 
-	var unreadMessages: Int {
+	var mostRecentPrivateMessage: MessageEntity? {
+		// Most recent channel message (descending, limit 1)
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
+		fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: false)]
+		fetchRequest.fetchLimit = 1
+
+		return (try? context.fetch(fetchRequest))?.first
+	}
 
-		let unreadMessages = allPrivateMessages.filter { ($0 as AnyObject).read == false }
-		return unreadMessages.count
+	func unreadMessages(context: NSManagedObjectContext) -> Int {
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
+		fetchRequest.sortDescriptors = [] // sort is irrelvant.
+		fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fetchRequest.predicate!, NSPredicate(format: "read == false")])
+
+		return (try? context.count(for: fetchRequest)) ?? 0
 	}
 
+	// Backwards-compatible property (uses viewContext)
+	var unreadMessages: Int { unreadMessages(context: PersistenceController.shared.container.viewContext) }
+
 	var protoBuf: Channel {
 		var channel = Channel()
 		channel.index = self.index

Meshtastic/Extensions/CoreData/MyInfoEntityExtension.swift

@@ -6,23 +6,39 @@
 //
 
 import Foundation
+import CoreData
 
 extension MyInfoEntity {
+	var messagePredicate: NSPredicate {
+		return NSPredicate(format: "toUser == nil AND isEmoji == false")
+	}
 
-	var messageList: [MessageEntity] {
-		let context = PersistenceController.shared.container.viewContext
+	var messageFetchRequest: NSFetchRequest<MessageEntity> {
 		let fetchRequest = MessageEntity.fetchRequest()
 		fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
-		fetchRequest.predicate = NSPredicate(format: "toUser == nil")
+		fetchRequest.predicate = messagePredicate
+		return fetchRequest
+	}
 
-		return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
+	var messageList: [MessageEntity] {
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
+
+		return (try? context.fetch(messageFetchRequest)) ?? [MessageEntity]()
 	}
 
-	var unreadMessages: Int {
-		let unreadMessages = messageList.filter { ($0 as AnyObject).read == false && ($0 as AnyObject).isEmoji == false }
-		return unreadMessages.count
+	func unreadMessages(context: NSManagedObjectContext) -> Int {
+		// Returns the count of unread *channel* messages
+		let fetchRequest = messageFetchRequest
+		fetchRequest.sortDescriptors = [] // sort is irrelvant.
+		fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fetchRequest.predicate!, NSPredicate(format: "read == false")])
+
+		return (try? context.count(for: fetchRequest)) ?? 0
 	}
 
+	// Backwards-compatible property (uses viewContext)
+	var unreadMessages: Int { unreadMessages(context: PersistenceController.shared.container.viewContext) }
+
 	var hasAdmin: Bool {
 		let adminChannel = channels?.filter { ($0 as AnyObject).name?.lowercased() == "admin" }
 		return adminChannel?.count ?? 0 > 0

Meshtastic/Extensions/CoreData/PositionEntityExtension.swift

@@ -96,10 +96,40 @@ extension PositionEntity {
 		}
 		return pointAnn
 	}
+
+	var isPreciseLocation: Bool {
+		precisionBits == 32 || precisionBits == 0
+	}
+
+	var fuzzedNodeCoordinate: CLLocationCoordinate2D? {
+		// With reduced precisionBits, many nodes can overlap on the map, making them unclickable.
+		// Use a hash of the position ID to fuzz coordinate slightly so that these nodes can be distinguished at the higest zoom levels. This allows them to be clicked individually.
+		if latitudeI != 0 && longitudeI != 0 {
+			// Derive two uniform pseudorandom numbers [0,1) from id.hashValue
+			let u1 = Double(id.hashValue & 0xFFFF) / 65536.0
+			let u2 = Double((id.hashValue >> 16) & 0xFFFF) / 65536.0
+
+			// Angle and radius
+			let offsetAngle = 2.0 * .pi * u1
+			let offsetRadius = 0.00001 * sqrt(u2) // 1.0e-5 degrees at equator is about 1.11 m or 4 ft
+
+			let dLat = sin(offsetAngle) * offsetRadius
+			let dLon = cos(offsetAngle) * offsetRadius
+
+			let coord = CLLocationCoordinate2D(
+				latitude: latitude! + dLat,
+				longitude: longitude! + dLon
+			)
+			return coord
+		} else {
+			return nil
+		}
+	}
 }
 
 extension PositionEntity: MKAnnotation {
 	public var coordinate: CLLocationCoordinate2D { nodeCoordinate ?? LocationsHandler.DefaultLocation }
+	public var fuzzedCoordinate: CLLocationCoordinate2D { fuzzedNodeCoordinate ?? LocationsHandler.DefaultLocation }
 	public var title: String? {  nodePosition?.user?.shortName ?? "Unknown".localized }
 	public var subtitle: String? {  time?.formatted() }
 }

Meshtastic/Extensions/CoreData/UserEntityExtension.swift

@@ -10,16 +10,37 @@ import CoreData
 import MeshtasticProtobufs
 
 extension UserEntity {
+	var messagePredicate: NSPredicate {
+		return NSPredicate(format: "((toUser == %@) OR (fromUser == %@)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10", self, self)
+	}
 
-	var messageList: [MessageEntity] {
-		let context = PersistenceController.shared.container.viewContext
+	var messageFetchRequest: NSFetchRequest<MessageEntity> {
 		let fetchRequest = MessageEntity.fetchRequest()
 		fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: true)]
-		fetchRequest.predicate = NSPredicate(format: "((toUser == %@) OR (fromUser == %@)) AND toUser != nil AND fromUser != nil AND isEmoji == false AND admin = false AND portNum != 10", self, self)
+		fetchRequest.predicate = messagePredicate
+		return fetchRequest
+	}
+
+	var messageList: [MessageEntity] {
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
 
 		return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
 	}
 
+	var mostRecentMessage: MessageEntity? {
+		// Most contacts will have no DMs history, so we can return early.
+		guard self.lastMessage != nil else { return nil; }
+
+		// Most recent DM for this user (descending, limit 1)
+		let context = PersistenceController.shared.container.viewContext
+		let fetchRequest = messageFetchRequest
+		fetchRequest.sortDescriptors = [NSSortDescriptor(key: "messageTimestamp", ascending: false)]
+		fetchRequest.fetchLimit = 1
+
+		return (try? context.fetch(fetchRequest))?.first
+	}
+
 	var sensorMessageList: [MessageEntity] {
 		let context = PersistenceController.shared.container.viewContext
 		let fetchRequest = MessageEntity.fetchRequest()
@@ -29,10 +50,21 @@ extension UserEntity {
 		return (try? context.fetch(fetchRequest)) ?? [MessageEntity]()
 	}
 
-	var unreadMessages: Int {
-		let unreadMessages = messageList.filter { ($0 as AnyObject).read == false && ($0 as AnyObject).isEmoji == false }
-		return unreadMessages.count
+	func unreadMessages(context: NSManagedObjectContext, skipLastMessageCheck: Bool = false) -> Int {
+		// Most contacts will have no DMs history, so we can return early.
+		// (For our own node, set skipLastMessageCheck=true, because we don't update lastMessage on our own connected node.)
+		guard self.lastMessage != nil || skipLastMessageCheck else { return 0; }
+
+		let fetchRequest = messageFetchRequest
+		fetchRequest.sortDescriptors = [] // sort is irrelvant.
+		fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fetchRequest.predicate!, NSPredicate(format: "read == false")])
+
+		return (try? context.count(for: fetchRequest)) ?? 0
 	}
+
+	// Backwards-compatible property (uses viewContext)
+	var unreadMessages: Int { unreadMessages(context: PersistenceController.shared.container.viewContext) }
+
 	/// SVG Images for Vendors who are signed project backers
 	var hardwareImage: String? {
 		guard let hwModel else { return nil }
@@ -130,6 +162,7 @@ public func createUser(num: Int64, context: NSManagedObjectContext) throws -> Us
 		newUser.longName = "Meshtastic \(last4)"
 		newUser.shortName = last4
 		newUser.hwModel = "UNSET"
+		newUser.unmessagable = false
 	}
 
 	return newUser