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

Merge pull request #782 from meshtastic/no-unix-epoch

Browse source
This commit is contained in:
Blake McAnally 2024-07-10 11:38:31 -05:00 • committed by GitHub
commit 3a248b6121
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Helpers/MeshPackets.swift
View file

@ -276,7 +276,7 @@ func nodeInfoPacket (nodeInfo: NodeInfo, channel: UInt32, context: NSManagedObje
newTelemetries.append(telemetry)
newNode.telemetries? = NSOrderedSet(array: newTelemetries)
}
newNode.firstHeard = Date(timeIntervalSince1970: TimeInterval(Int64(nodeInfo.lastHeard)))
newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(nodeInfo.lastHeard)))
newNode.snr = nodeInfo.snr
if nodeInfo.hasUser {

2
Meshtastic/Persistence/UpdateCoreData.swift
View file

@ -145,7 +145,7 @@ func upsertNodeInfoPacket (packet: MeshPacket, context: NSManagedObjectContext)
let newNode = NodeInfoEntity(context: context)
newNode.id = Int64(packet.from)
newNode.num = Int64(packet.from)
if packet.rxTime != 0 {
if packet.rxTime > 0 {
newNode.firstHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
newNode.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
}

4
Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
View file

@ -114,7 +114,7 @@ struct NodeDetail: View {
}
}
if let firstHeard = node.firstHeard {
if let firstHeard = node.firstHeard, firstHeard.timeIntervalSince1970 > 0 {
HStack {
Label {
Text("First heard")
@ -135,7 +135,7 @@ struct NodeDetail: View {
}
}
if let lastHeard = node.lastHeard {
if let lastHeard = node.lastHeard, lastHeard.timeIntervalSince1970 > 0 {
HStack {
Label {
Text("Last heard")