meshtastic · garthvh · Oct 18, 2025 · Oct 18, 2025 · Oct 18, 2025 · Oct 18, 2025
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -1486,8 +1486,8 @@
         }
       }
     },
-    "⚠️ The configured value: (%@ seconds) is not one of the optimized options." : {
-      "comment" : "A text warning that the configured update interval is not one of the optimized options.",
+    "⚠️ The configured value: (%@) is not one of the optimized options." : {
+      "comment" : "A warning label below the picker, indicating that the selected update interval is not one of the optimized options.",
       "isCommentAutoGenerated" : true
     },
     "🦕 End of life Version 🦖 ☄️" : {
@@ -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" : {
@@ -18925,6 +18921,13 @@
           }
         }
       }
+    },
+    "Last seen device:" : {
+      "comment" : "A label displayed next to the last seen device text in the `DeviceConnectRow`.",
+      "isCommentAutoGenerated" : true
+    },
+    "Last seen device: %@" : {
+
     },
     "Latitude" : {
       "localizations" : {
@@ -20445,6 +20448,9 @@
           }
         }
       }
+    },
+    "Manual Connections" : {
+
     },
     "Map Data" : {
       "localizations" : {
@@ -20929,6 +20935,9 @@
           }
         }
       }
+    },
+    "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." : {
+
     },
     "Meshtastic Node %@ has shared channels with you" : {
       "localizations" : {
@@ -28470,6 +28479,7 @@
       }
     },
     "Received Ack" : {
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -28532,8 +28542,12 @@
           }
         }
       }
+    },
+    "Received Ack: %@" : {
+
     },
     "Recipient Ack" : {
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -28596,6 +28610,9 @@
           }
         }
       }
+    },
+    "Recipient Ack: %@" : {
+
     },
     "Recording route" : {
       "localizations" : {
@@ -28779,6 +28796,16 @@
         }
       }
     },
+    "Relayed by %d %@" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Relayed by %1$d %2$@"
+          }
+        }
+      }
+    },
     "Release Notes" : {
       "localizations" : {
         "it" : {
@@ -36743,7 +36770,12 @@
         }
       }
     },
+    "These settings will %@" : {
+      "comment" : "A paragraph below the title that explains what the user is about to do.",
+      "isCommentAutoGenerated" : true
+    },
     "These settings will %@ channels. The current LoRa Config will be replaced, if there are substantial changes to the LoRa config the device will reboot" : {
+      "extractionState" : "stale",
       "localizations" : {
         "it" : {
           "stringUnit" : {
@@ -40176,6 +40208,9 @@
           }
         }
       }
+    },
+    "User Privacy" : {
+
     },
     "User Uploaded" : {
       "comment" : "Data source label for user uploaded files",
@@ -41040,10 +41075,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" : {

diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
@@ -42,6 +42,7 @@
 		2344A2B12D68DFF800170A77 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25C49D8F2C471AEA0024FBD1 /* Constants.swift */; };
 		2346A7192E2FB9A300CB9239 /* SerialConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2346A7182E2FB9A300CB9239 /* SerialConnection.swift */; };
 		2346A71D2E2FB9C500CB9239 /* SerialTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2346A71C2E2FB9C500CB9239 /* SerialTransport.swift */; };
+		2349A04A2EAE4DA30060A581 /* ManualConnectionList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2349A0492EAE4DA30060A581 /* ManualConnectionList.swift */; };
 		2373AE132D0A216C0086C749 /* MetricsChartSeries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2373AE122D0A216C0086C749 /* MetricsChartSeries.swift */; };
 		2373AE152D0A24930086C749 /* MetricsSeriesList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2373AE142D0A24930086C749 /* MetricsSeriesList.swift */; };
 		2373AE172D0A26620086C749 /* EnvironmentDefaultSeries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2373AE162D0A26620086C749 /* EnvironmentDefaultSeries.swift */; };
@@ -357,6 +358,7 @@
 		2344A2AE2D6697A700170A77 /* TelemetryEntity+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TelemetryEntity+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		2346A7182E2FB9A300CB9239 /* SerialConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialConnection.swift; sourceTree = "<group>"; };
 		2346A71C2E2FB9C500CB9239 /* SerialTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialTransport.swift; sourceTree = "<group>"; };
+		2349A0492EAE4DA30060A581 /* ManualConnectionList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualConnectionList.swift; sourceTree = "<group>"; };
 		2373AE122D0A216C0086C749 /* MetricsChartSeries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetricsChartSeries.swift; sourceTree = "<group>"; };
 		2373AE142D0A24930086C749 /* MetricsSeriesList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetricsSeriesList.swift; sourceTree = "<group>"; };
 		2373AE162D0A26620086C749 /* EnvironmentDefaultSeries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentDefaultSeries.swift; sourceTree = "<group>"; };
@@ -832,6 +834,7 @@
 				23D316922E5618D2002FA4FB /* AsyncGate.swift */,
 				23E23F912E392C2B00919073 /* LogRecord+StringRepresentation.swift */,
 				23D9D9382E50DA97005D1C18 /* ResettableTimer.swift */,
+				2349A0492EAE4DA30060A581 /* ManualConnectionList.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -1841,6 +1844,7 @@
 				BCDDFA9A2DBB180D0065189C /* ScrollToBottomButton.swift in Sources */,
 				DDC4C9FF2A8D982900CE201C /* DetectionSensorConfig.swift in Sources */,
 				2344A2AF2D6697A700170A77 /* TelemetryEntity+CoreDataClass.swift in Sources */,
+				2349A04A2EAE4DA30060A581 /* ManualConnectionList.swift in Sources */,
 				2344A2B02D6697A700170A77 /* TelemetryEntity+CoreDataProperties.swift in Sources */,
 				D9C983A22B79D1A600BDBE6A /* RequestPositionButton.swift in Sources */,
 				237AEB8F2E1FE457003B7CE3 /* Transport.swift in Sources */,
@@ -2094,7 +2098,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 +2133,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 +2165,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 +2198,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 = "";

diff --git a/Meshtastic/Accessory/Accessory Manager/AccessoryManager+Connect.swift b/Meshtastic/Accessory/Accessory Manager/AccessoryManager+Connect.swift
@@ -66,10 +66,6 @@ extension AccessoryManager {
 						Logger.transport.info("[Accessory] Event stream closed")
 					}
 					self.activeConnection = (device: device, connection: connection)
-
-					if UserDefaults.preferredPeripheralId.count < 1 {
-						UserDefaults.preferredPeripheralId = device.id.uuidString
-					}
 				} catch let error as CBError where error.code == .peerRemovedPairingInformation {
 					await self.connectionStepper?.cancelCurrentlyExecutingStep(withError: AccessoryError.coreBluetoothError(error), cancelFullProcess: true)
 				}
@@ -114,6 +110,10 @@ extension AccessoryManager {
 				Logger.transport.info("🔗👟 [Connect] Step 5: Send wantConfig (database)")
 				self.updateState(.retrievingDatabase(nodeCount: 0))
 				self.allowDisconnect = true
+
+				Logger.transport.info("🔗 Saving preferredPeripheralId: \(device.id.uuidString)")
+				UserDefaults.preferredPeripheralId = device.id.uuidString
+
 				try await self.sendWantDatabase()
 			}
 
@@ -168,6 +168,15 @@ extension AccessoryManager {
 				// We have an active connection
 				self.updateDevice(deviceId: device.id, key: \.connectionState, value: .connected)
 				self.updateState(.subscribed)
+
+				// If we successfully connected to a manual connection, then save it to the list
+				// Remember, Device is a value type (struct) so don't use use `device` here, thats
+				// The value at the instantiation of the connect process.  We want the currently
+				// updated device object in `activeConnection` with its additonal metadata from
+				// NodeInfo packets.
+				if let activeDevice = self.activeConnection?.device, activeDevice.isManualConnection {
+					ManualConnectionList.shared.insert(device: activeDevice)
+				}
 			}
 
 			// Step 8: Update UI and status to connected

diff --git a/Meshtastic/Accessory/Accessory Manager/AccessoryManager+FromRadio.swift b/Meshtastic/Accessory/Accessory Manager/AccessoryManager+FromRadio.swift
@@ -106,13 +106,25 @@ 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 ?? "?")
 					updateDevice(deviceId: activeDevice.id, key: \.longName, value: user.longName ?? "Unknown".localized)
 					updateDevice(deviceId: activeDevice.id, key: \.hardwareModel, value: user.hwModel)
+
+					if activeDevice.isManualConnection {
+						// We just received a NodeInfo for the currently connected node and this is a
+						// manual connection.  Update the metadata for the device entry in UserDefaults
+						// with this information for better display later
+						ManualConnectionList.shared.updateDevice(deviceId: activeDevice.id, key: \.shortName, value: user.shortName)
+						ManualConnectionList.shared.updateDevice(deviceId: activeDevice.id, key: \.longName, value: user.longName)
+						ManualConnectionList.shared.updateDevice(deviceId: activeDevice.id, key: \.hardwareModel, value: user.hwModel)
+					}
 				}
 			}
 		}

diff --git a/Meshtastic/Accessory/Accessory Manager/AccessoryManager+MQTT.swift b/Meshtastic/Accessory/Accessory Manager/AccessoryManager+MQTT.swift
@@ -32,14 +32,12 @@ extension AccessoryManager {
 					}
 				}
 				// Set initial unread message badge states
-				appState.unreadChannelMessages = fetchedNodeInfo[0].myInfo?.unreadMessages ?? 0
-				appState.unreadDirectMessages = fetchedNodeInfo[0].user?.unreadMessages ?? 0
-			}
-			if fetchedNodeInfo.count == 1 && fetchedNodeInfo[0].rangeTestConfig?.enabled == true {
-				wantRangeTestPackets = true
-			}
-			if fetchedNodeInfo.count == 1 && fetchedNodeInfo[0].storeForwardConfig?.enabled == true {
-				wantStoreAndForwardPackets = true
+				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
+
+				// Set wantRangeTestPackets and wantStoreAndForwardPackets
+				wantRangeTestPackets = fetchedNodeInfo[0].rangeTestConfig?.enabled ?? false
+				wantStoreAndForwardPackets = fetchedNodeInfo[0].storeForwardConfig?.enabled ?? false
 			}
 		} catch {
 			Logger.data.error("Failed to find a node info for the connected node \(error.localizedDescription, privacy: .public)")

diff --git a/Meshtastic/Accessory/Accessory Manager/AccessoryManager+ToRadio.swift b/Meshtastic/Accessory/Accessory Manager/AccessoryManager+ToRadio.swift
@@ -509,32 +509,32 @@ extension AccessoryManager {
 				let logString = String.localizedStringWithFormat("Sent a Channel for: %@ Channel Index %d".localized, String(deviceNum), chan.index)
 				try await send(toRadio, debugDescription: logString)
 			}
-
-			// Save the LoRa Config and the device will reboot
-			var adminPacket = AdminMessage()
-			adminPacket.setConfig.lora = channelSet.loraConfig
-			adminPacket.setConfig.lora.configOkToMqtt = okToMQTT // Preserve users okToMQTT choice
-			var meshPacket: MeshPacket = MeshPacket()
-			meshPacket.to = UInt32(deviceNum)
-			meshPacket.from	= UInt32(deviceNum)
-			meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
-			meshPacket.priority =  MeshPacket.Priority.reliable
-			meshPacket.wantAck = true
-			meshPacket.channel = 0
-			var dataMessage = DataMessage()
-			guard let adminData: Data = try? adminPacket.serializedData() else {
-				throw AccessoryError.ioFailed("sendReboot: Unable to serialize Admin packet")
+			if !addChannels {
+				// Save the LoRa Config and the device will reboot
+				var adminPacket = AdminMessage()
+				adminPacket.setConfig.lora = channelSet.loraConfig
+				adminPacket.setConfig.lora.configOkToMqtt = okToMQTT // Preserve users okToMQTT choice
+				var meshPacket: MeshPacket = MeshPacket()
+				meshPacket.to = UInt32(deviceNum)
+				meshPacket.from	= UInt32(deviceNum)
+				meshPacket.id = UInt32.random(in: UInt32(UInt8.max)..<UInt32.max)
+				meshPacket.priority =  MeshPacket.Priority.reliable
+				meshPacket.wantAck = true
+				meshPacket.channel = 0
+				var dataMessage = DataMessage()
+				guard let adminData: Data = try? adminPacket.serializedData() else {
+					throw AccessoryError.ioFailed("sendReboot: Unable to serialize Admin packet")
+				}
+				dataMessage.payload = adminData
+				dataMessage.portnum = PortNum.adminApp
+				meshPacket.decoded = dataMessage
+				var toRadio: ToRadio!
+				toRadio = ToRadio()
+				toRadio.packet = meshPacket
+
+				let logString = String.localizedStringWithFormat("Sent a LoRa.Config for: %@".localized, String(deviceNum))
+				try await send(toRadio, debugDescription: logString)
 			}
-			dataMessage.payload = adminData
-			dataMessage.portnum = PortNum.adminApp
-			meshPacket.decoded = dataMessage
-			var toRadio: ToRadio!
-			toRadio = ToRadio()
-			toRadio.packet = meshPacket
-
-			let logString = String.localizedStringWithFormat("Sent a LoRa.Config for: %@".localized, String(deviceNum))
-			try await send(toRadio, debugDescription: logString)
-
 			Logger.transport.debug("[AccessoryManager] sending wantConfig for saveChannelSet")
 			try await sendWantConfig()
 		}