meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Position enchange notificaton

Browse source
This commit is contained in:
Garth Vander Houwen 2024-08-01 21:51:01 -07:00
parent 267e5615e3
commit 8436d7b76f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -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, context: context)
upsertPositionPacket(packet: decodedInfo.packet, connectedNodeNum: self.connectedPeripheral.num, context: context)
case .waypointApp:
waypointPacket(packet: decodedInfo.packet, context: context)
case .nodeinfoApp:

8
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -280,7 +280,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
}
}
func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext) {
func upsertPositionPacket (packet: MeshPacket, connectedNodeNum: Int64, context: NSManagedObjectContext) {
let logString = String.localizedStringWithFormat("mesh.log.position.received %@".localized, String(packet.from))
MeshLogger.log("📍 \(logString)")
@ -358,14 +358,14 @@ func upsertPositionPacket (packet: MeshPacket, context: NSManagedObjectContext)
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 {
if packet.from != 4294967295 && packet.to == UInt32(truncatingIfNeeded: connectedNodeNum) {
let manager = LocalNotificationManager()
manager.notifications = [
Notification(
id: (UUID().uuidString),
title: "Position Exchange",
subtitle: "\(packet.from.toHex()) replied with a position for \(packet.to.toHex())",
content: "From User has shared their location with you.",
subtitle: "\(fetchedNode[0].user?.shortName ?? "unknown".localized)",
content: "\(fetchedNode[0].user?.longName ?? "unknown".localized) has shared their location with you.",
target: "nodes",
path: "meshtastic:///nodes?nodenum=\(packet.from)&detail=nodeMap"
)