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

Show messaged instead of packetid in ACK logging, change delivered to acknowledged.

Browse source
This commit is contained in:
Garth Vander Houwen 2022-03-14 20:14:27 -07:00
parent 13360c4848
commit 2d9b448ee6
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MeshtasticClient/Helpers/BLEManager.swift
View file

@ -913,6 +913,8 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
} else {
fetchedMessage!.ackTimestamp = Int32(decodedInfo.packet.rxTime)
}
fetchedMessage!.objectWillChange.send()
} else {
if meshLoggingEnabled { MeshLogger.log("ℹ️ MESH PACKET received for Routing App UNHANDLED \(try decodedInfo.packet.jsonString())") }
@ -922,9 +924,9 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph
try context!.save()
if meshLoggingEnabled {
MeshLogger.log("💾 ACK Received and saved for MessageID \(decodedInfo.packet.id)")
MeshLogger.log("💾 ACK Received and saved for MessageID \(decodedInfo.packet.decoded.requestID)")
}
print("💾 ACK Received and saved for MessageID \(decodedInfo.packet.id)")
print("💾 ACK Received and saved for MessageID \(decodedInfo.packet.decoded.requestID)")
} catch {

21
MeshtasticClient/Views/Messages/UserMessageList.swift
View file

@ -291,13 +291,9 @@ struct UserMessageList: View {
HStack {
let time = Int32(message.messageTimestamp)
let messageDate = Date(timeIntervalSince1970: TimeInterval(time))
let showUntil = Date().addingTimeInterval(3600)
if messageDate <= showUntil && message.receivedACK {
if message.receivedACK {
Text("Delivered").font(.caption2).foregroundColor(.gray)
Text("Acknowledged").font(.caption2).foregroundColor(.gray)
}
}
@ -345,18 +341,15 @@ struct UserMessageList: View {
if allMessages.count > 1 {
withAnimation(Animation.spring().delay(1)) {
scrollView.scrollTo(allMessages.firstIndex(of: allMessages.last! ), anchor: .bottom)
}
scrollView.scrollTo(allMessages.firstIndex(of: allMessages.last! ), anchor: .bottom)
}
})
.onChange(of: allMessages.count, perform: { count in
.onChange(of: allMessages, perform: { message in
if count > 1 {
if allMessages.count > 1 {
withAnimation(Animation.spring().delay(1)) {
scrollView.scrollTo(allMessages.firstIndex(of: allMessages.last! ), anchor: .bottom)
}
scrollView.scrollTo(allMessages.firstIndex(of: allMessages.last! ), anchor: .bottom)
}
})
}