Merge pull request #1028 from meshtastic/2.5.13

2.5.13
meshtastic · Dec 20, 2024 · 561d576 · 561d576
2 parents 7cbc9cf + 628e3d1
commit 561d576
Show file tree

Hide file tree

Showing 29 changed files with 7,945 additions and 2,172 deletions.
diff --git a/Localizable.xcstrings b/Localizable.xcstrings
diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
@@ -1203,6 +1203,7 @@
 				"zh-Hant-TW",
 				se,
 				"pt-PT",
+				sr,
 			);
 			mainGroup = DDC2E14B26CE248E0042C5E4;
 			packageReferences = (
@@ -1709,7 +1710,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.12;
+				MARKETING_VERSION = 2.5.13;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1743,7 +1744,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.12;
+				MARKETING_VERSION = 2.5.13;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1775,7 +1776,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.12;
+				MARKETING_VERSION = 2.5.13;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1808,7 +1809,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.5.12;
+				MARKETING_VERSION = 2.5.13;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Meshtastic/Extensions/CoreData/UserEntityExtension.swift b/Meshtastic/Extensions/CoreData/UserEntityExtension.swift
@@ -77,20 +77,20 @@ extension UserEntity {
 			return "TLORAV2118"
 		/// Seeed Studio
 		case "SENSECAPINDICATOR":
-			return "UNSET"
+			return "SENSECAPINDICATOR"
 		case "TRACKERT1000E":
-			return "UNSET"
+			return "TRACKERT1000E"
 		case "SEEEDXIAOS3":
-			return "UNSET"
+			return "SEEEDXIAOS3"
 		case "WIOWM1110":
-			return "UNSET"
+			return "WIOWM1110"
 		/// RAK Wireless
 		case "RAK4631":
-			return "UNSET"
+			return "RAK4631"
 		case "RAK11310":
-			return "UNSET"
+			return "RAK11310"
 		case "WISMESHTAP":
-			return "UNSET"
+			return "WISMESHTAP"
 		/// B&Q Consulting
 		case "NANOG1", "NANOG1EXPLORER":
 			return "NANOG1"

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
@@ -663,15 +663,15 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 			}
 
 			switch decodedInfo.packet.decoded.portnum {
-
+				
 				// Handle Any local only packets we get over BLE
 			case .unknownApp:
 				var nowKnown = false
-
+				
 				// MyInfo from initial connection
 				if decodedInfo.myInfo.isInitialized && decodedInfo.myInfo.myNodeNum > 0 {
 					let myInfo = myInfoPacket(myInfo: decodedInfo.myInfo, peripheralId: self.connectedPeripheral.id, context: context)
-
+					
 					if myInfo != nil {
 						UserDefaults.preferredPeripheralNum = Int(myInfo?.myNodeNum ?? 0)
 						connectedPeripheral.num = myInfo?.myNodeNum ?? 0
@@ -890,7 +890,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 								}
 							}
 							hopNodes.append(traceRouteHop)
-
+							
 							let hopName = hopNode?.user?.longName ?? (node == 4294967295 ? "Repeater" : String(hopNode?.num.toHex() ?? "unknown".localized))
 							let mqttLabel = hopNode?.viaMqtt ?? false ? "MQTT " : ""
 							let snrLabel = (traceRouteHop.snr != -32) ? String(traceRouteHop.snr) : "unknown ".localized
@@ -912,7 +912,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 						/// Add the destination node to the end of the route towards string and the beginning of the route back string
 						routeString += "\(traceRoute?.node?.user?.longName ?? "unknown".localized) \((traceRoute?.node?.num ?? 0).toHex()) (\(destinationHop.snr != -32 ? String(destinationHop.snr) : "unknown ".localized)dB)"
 						traceRoute?.routeText = routeString
-
+						
 						traceRoute?.hopsBack = Int32(routingMessage.routeBack.count)
 						// Only if hopStart is set and there is an SNR entry
 						if decodedInfo.packet.hopStart > 0 && routingMessage.snrBack.count > 0 {
@@ -946,7 +946,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 									}
 								}
 								hopNodes.append(traceRouteHop)
-
+								
 								let hopName = hopNode?.user?.longName ?? (node == 4294967295 ? "Repeater" : String(hopNode?.num.toHex() ?? "unknown".localized))
 								let mqttLabel = hopNode?.viaMqtt ?? false ? "MQTT " : ""
 								let snrLabel = (traceRouteHop.snr != -32) ? String(traceRouteHop.snr) : "unknown ".localized
@@ -988,6 +988,8 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
 				MeshLogger.log("🕸️ MESH PACKET received for ATAK Plugin App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")")
 			case .powerstressApp:
 				MeshLogger.log("🕸️ MESH PACKET received for Power Stress App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")")
+			case .alertApp:
+				MeshLogger.log("🕸️ MESH PACKET received for Alert App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")")
 			}
 
 			if decodedInfo.configCompleteID != 0 && decodedInfo.configCompleteID == configNonce {

diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
@@ -912,7 +912,7 @@ func textMessageAppPacket(
 				}
 			} else {
 				/// Make a new from user if they are unknown
-				newMessage.fromUser = createUser(num: Int64(truncatingIfNeeded: packet.to), context: context)
+				newMessage.fromUser = createUser(num: Int64(truncatingIfNeeded: packet.from), context: context)
 			}
 			if packet.rxTime > 0 {
 				newMessage.fromUser?.userNode?.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))

diff --git a/Meshtastic/Views/Nodes/TraceRouteLog.swift b/Meshtastic/Views/Nodes/TraceRouteLog.swift
@@ -37,20 +37,21 @@ struct TraceRouteLog: View {
 				VStack {
 					List(node.traceRoutes?.reversed() as? [TraceRouteEntity] ?? [], id: \.self, selection: $selectedRoute) { route in
 						Label {
-							if route.response && route.hopsTowards == 0 {
-								Text("\(route.time?.formatted() ?? "unknown".localized) - Direct")
-									.font(.caption)
-							} else if route.response && route.hopsTowards == 1 {
-								Text("\(route.time?.formatted() ?? "unknown".localized) - 1 Hop")
+							let routeTime = route.time?.formatted() ?? "unknown".localized
+							if route.response && route.hopsTowards == route.hopsBack {
+								let hopString = String(localized: "\(route.hopsTowards) Hops")
+								Text("\(routeTime) - \(hopString)")
 									.font(.caption)
 							} else if route.response {
-								Text("\(route.time?.formatted() ?? "unknown".localized) - \(route.hopsTowards) Hops Towards \(route.hopsBack) Hops Back")
+								let hopTowardsString = String(localized: "\(route.hopsTowards) Hops")
+								let hopBackString = String(localized: "\(route.hopsBack) Hops")
+								Text("\(routeTime) - \(hopTowardsString) Towards  \(hopBackString) Back")
 									.font(.caption)
 							} else if route.sent {
-								Text("\(route.time?.formatted() ?? "unknown".localized) - No Response")
+								Text("\(routeTime) - No Response")
 									.font(.caption)
 							} else {
-								Text("\(route.time?.formatted() ?? "unknown".localized) - Not Sent")
+								Text("\(routeTime) - Not Sent")
 									.font(.caption)
 							}
 						} icon: {