From 3dbe92c599150bd4afb741d343020dfc790f9694 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 1 Aug 2024 22:06:37 -0700 Subject: [PATCH] Simplify --- Meshtastic/Helpers/BLEManager.swift | 2 +- Meshtastic/Persistence/UpdateCoreData.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index a04c78af..93879e02 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -751,7 +751,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate case .remoteHardwareApp: MeshLogger.log("πŸ•ΈοΈ MESH PACKET received for Remote Hardware App UNHANDLED \((try? decodedInfo.packet.jsonString()) ?? "JSON Decode Failure")") case .positionApp: - upsertPositionPacket(packet: decodedInfo.packet, connectedNodeNum: self.connectedPeripheral.num, context: context) + upsertPositionPacket(packet: decodedInfo.packet, context: context) case .waypointApp: waypointPacket(packet: decodedInfo.packet, context: context) case .nodeinfoApp: diff --git a/Meshtastic/Persistence/UpdateCoreData.swift b/Meshtastic/Persistence/UpdateCoreData.swift index b2cc65e7..7aa3d902 100644 --- a/Meshtastic/Persistence/UpdateCoreData.swift +++ b/Meshtastic/Persistence/UpdateCoreData.swift @@ -280,7 +280,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext) } } -func upsertPositionPacket (packet: MeshPacket, connectedNodeNum: Int64, context: NSManagedObjectContext) { +func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext) { let logString = String.localizedStringWithFormat("mesh.log.position.received %@".localized, String(packet.from)) MeshLogger.log("πŸ“ \(logString)") @@ -290,7 +290,7 @@ func upsertPositionPacket (packet: MeshPacket, connectedNodeNum: Int64, context: do { - if let positionMessage = try? Position(serializedData: packet.decoded.payload) { + if let positionMessage = try? Position(serializedBytes: packet.decoded.payload) { /// Don't save empty position packets from null island or apple park if (positionMessage.longitudeI != 0 && positionMessage.latitudeI != 0) && (positionMessage.latitudeI != 373346000 && positionMessage.longitudeI != -1220090000) { @@ -358,7 +358,7 @@ func upsertPositionPacket (packet: MeshPacket, connectedNodeNum: Int64, context: try context.save() Logger.data.info("πŸ’Ύ [Position] Saved from Position App Packet For: \(fetchedNode[0].num.toHex(), privacy: .public)") // Notification for position exchanges - if packet.from != 4294967295 && packet.to == UInt32(truncatingIfNeeded: connectedNodeNum) { + if packet.to != 4294967295 { let manager = LocalNotificationManager() manager.notifications = [ Notification(