dandri/ZephCore
1
0
Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-09-01 20:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

joystick UI: prefix sender to mirrored channel sends for BLE app

Browse Source 
BaseChatMesh::sendGroupMessage wraps the body as "<sender_name>: <body>"
before transmitting (the receiver's onChannelMessageRecv sees the full
"USER: MSG" string, which CompanionMesh queues as-is for the phone).
queueLocalSentChannelMessage was queuing just the raw body, so the
phone parsed an empty sender and lost the body. Prepend
"<prefs.node_name>: " to mirror the wire format.

joystick UI: prefix DM mirrors to phone with sent-marker

DM offline-queue frames identify the sender by pubkey field, not by
in-text prefix. queueLocalSentContactMessage was queuing with the
contact's pubkey + raw body, so the phone app rendered wio-originated
DMs identically to incoming ones from that contact. Prepend "(>>) "
to the body so sent messages are visually distinguishable; matches
the joystick UI's own sent indicator (UnreadScreen::addPreview).
This commit is contained in:
liquidraver
2026-05-21 13:41:13 +02:00
parent 0081e7af2b
commit ec2ae31b67
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/app/CompanionMesh.cpp
+22
View File
@@ -788,6 +788,18 @@ void CompanionMesh::queueLocalSentContactMessage(const ContactInfo &contact,
frame[i++] = TXT_TYPE_PLAIN;
put_le32(&frame[i], timestamp);
i += 4;
/* DM wire-text has no sender prefix (the sender is the pubkey field).
* For local-sent mirrors the phone app would otherwise show them as a
* message *from* the contact, indistinguishable from incoming. Prepend
* a visible marker so the user can see at a glance which side sent it.
* "(>>) " matches the joystick UI's own sent indicator in addPreview(). */
static const char kSentMarker[] = "(>>) ";
size_t marker_len = sizeof(kSentMarker) - 1;
if (i + marker_len <= sizeof(frame)) {
memcpy(&frame[i], kSentMarker, marker_len);
i += marker_len;
}
size_t text_len = strlen(text);
if (i + text_len > sizeof(frame)) {
text_len = sizeof(frame) - i;
@@ -820,6 +832,16 @@ void CompanionMesh::queueLocalSentChannelMessage(uint8_t channel_idx,
frame[i++] = TXT_TYPE_PLAIN;
put_le32(&frame[i], timestamp);
i += 4;
/* Channel wire-text is "<sender_name>: <body>" — the same prefix that
* BaseChatMesh::sendGroupMessage applied before transmitting over LoRa.
* The phone app parses up to the first ':' as the sender, the rest as
* the body, so we need to mirror that format here or the message
* shows up empty with the sender slot empty too. */
int n = snprintf((char *)&frame[i], sizeof(frame) - i, "%s: ", prefs.node_name);
if (n < 0) n = 0;
if ((size_t)n > sizeof(frame) - i) n = sizeof(frame) - i;
i += n;
size_t text_len = strlen(text);
if (i + text_len > sizeof(frame)) {
text_len = sizeof(frame) - i;