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

Fix showing canned messages

Browse source
This commit is contained in:
whywilson 2025-06-30 14:20:06 +08:00
parent 9fd6f72b0f
commit 1778edbad1
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Meshtastic/Helpers/MeshPackets.swift
View file

@ -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)

1
Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift
View file

@ -79,6 +79,7 @@ struct CannedMessagesConfig: View {
totalBytes = messages.utf8.count
}
hasMessagesChanges = true
hasChanges = true
}
.foregroundColor(.gray)
}