From 2d9b448ee6cb68323fbe094576423b29e26fc2a0 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 14 Mar 2022 20:14:27 -0700 Subject: [PATCH] Show messaged instead of packetid in ACK logging, change delivered to acknowledged. --- MeshtasticClient/Helpers/BLEManager.swift | 6 ++++-- .../Views/Messages/UserMessageList.swift | 21 +++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/MeshtasticClient/Helpers/BLEManager.swift b/MeshtasticClient/Helpers/BLEManager.swift index a174364d..45daa632 100644 --- a/MeshtasticClient/Helpers/BLEManager.swift +++ b/MeshtasticClient/Helpers/BLEManager.swift @@ -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 { diff --git a/MeshtasticClient/Views/Messages/UserMessageList.swift b/MeshtasticClient/Views/Messages/UserMessageList.swift index 08f8f482..801668c7 100644 --- a/MeshtasticClient/Views/Messages/UserMessageList.swift +++ b/MeshtasticClient/Views/Messages/UserMessageList.swift @@ -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) + } }) }