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

Update Meshtastic/Helpers/TAK/CoTMessage.swift

Browse source 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Ben Meadors 2026-01-30 07:29:39 -06:00 • committed by GitHub
parent 069ba276dc
commit 522c4ed56b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Meshtastic/Helpers/TAK/CoTMessage.swift
View file

@ -319,9 +319,26 @@ struct CoTMessage: Identifiable, Sendable {
// Chat elements (for b-t-f messages)
if let chat {
let messageId = UUID().uuidString
let senderUid = uid.hasPrefix("GeoChat.") ? String(uid.split(separator: ".")[1]) : uid
// Derive sender UID and messageId from GeoChat UID when possible, with safe fallbacks
let senderUid: String
let messageId: String
if uid.hasPrefix("GeoChat.") {
let components = uid.split(separator: ".")
if components.count >= 3 {
// Expected GeoChat format: GeoChat.<senderUid>.<messageId>
senderUid = String(components[1])
messageId = String(components[2])
} else {
// Malformed GeoChat UID; fall back safely
senderUid = uid
messageId = uid
}
} else {
// Non-GeoChat UID; use uid as both sender and stable message identifier
senderUid = uid
messageId = uid
}
cot += "<__chat parent='RootContactGroup' groupOwner='false' "
cot += "messageId='\(messageId)' "
cot += "chatroom='\(chat.chatroom.xmlEscaped)' id='\(chat.chatroom.xmlEscaped)' "