From 1778edbad1f676993cd2e903c8a6639fcbdfca54 Mon Sep 17 00:00:00 2001 From: whywilson Date: Mon, 30 Jun 2025 14:20:06 +0800 Subject: [PATCH] Fix showing canned messages --- Meshtastic/Helpers/MeshPackets.swift | 5 +---- .../Views/Settings/Config/Module/CannedMessagesConfig.swift | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift index 89d79f60..304865dc 100644 --- a/Meshtastic/Helpers/MeshPackets.swift +++ b/Meshtastic/Helpers/MeshPackets.swift @@ -504,9 +504,6 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) { if adminMessage.payloadVariant == AdminMessage.OneOf_PayloadVariant.getCannedMessageModuleMessagesResponse(adminMessage.getCannedMessageModuleMessagesResponse) { if let cmmc = try? CannedMessageModuleConfig(serializedBytes: packet.decoded.payload) { - - if !cmmc.messages.isEmpty { - let logString = String.localizedStringWithFormat("Canned Messages Messages Received For: %@".localized, packet.from.toHex()) Logger.mesh.info("🥫 \(logString, privacy: .public)") @@ -520,6 +517,7 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) { .replacingOccurrences(of: "11: ", with: "") .replacingOccurrences(of: "\"", with: "") .trimmingCharacters(in: .whitespacesAndNewlines) + .components(separatedBy: "\n")[0] fetchedNode[0].cannedMessageConfig?.messages = messages do { try context.save() @@ -533,7 +531,6 @@ func adminAppPacket (packet: MeshPacket, context: NSManagedObjectContext) { } catch { Logger.data.error("💥 Error Deserializing ADMIN_APP packet.") } - } } } else if adminMessage.payloadVariant == AdminMessage.OneOf_PayloadVariant.getChannelResponse(adminMessage.getChannelResponse) { channelPacket(channel: adminMessage.getChannelResponse, fromNum: Int64(packet.from), context: context) diff --git a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift index 941ed3fd..28ec19ad 100644 --- a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift @@ -79,6 +79,7 @@ struct CannedMessagesConfig: View { totalBytes = messages.utf8.count } hasMessagesChanges = true + hasChanges = true } .foregroundColor(.gray) }