Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-09-14 15:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(mesh): extract addOwnChannelMsg() for the "Me: " mirror framing

Browse Source 
Four call sites (three bot reply paths, one app-originated-send mirror)
each hand-built the same "Me: <text>" + own_message=true framing that
MessagesScreen relies on to render an outgoing bubble -- one of them
(now fixed) had already drifted to the wrong prefix once. Centralizing
it in AbstractUITask::addOwnChannelMsg() means a caller can no longer
get the framing wrong.
This commit is contained in:
Jakub
2026-08-31 22:44:32 +02:00
parent 90bf5e5a11
commit 1f7f1455a2
3 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/MyMesh.cpp
+13 -13
View File
@@ -2028,22 +2028,22 @@ void MyMesh::handleCmdFrame(size_t len) {
if (success && sendGroupMessage(msg_timestamp, channel.channel, _prefs.node_name, text, len - i)) {
writeOKFrame();
#ifdef DISPLAY_CLASS
// Mirror this app-originated channel post into the on-device history,
// same "Me: " framing MessagesScreen::afterSend uses for an on-device
// compose -- otherwise the two queues drift and a post sent from the
// phone app never shows up if that channel is later opened on-device.
// text isn't guaranteed null-terminated (len - i is its real length,
// same bound sendGroupMessage above was just given), so bound the copy.
// Mirror this app-originated channel post into the on-device history
// (addOwnChannelMsg applies the same "Me: " framing
// MessagesScreen::afterSend uses for an on-device compose) --
// otherwise the two queues drift and a post sent from the phone app
// never shows up if that channel is later opened on-device. text
// isn't guaranteed null-terminated (len - i is its real length, same
// bound sendGroupMessage above was just given), so bound the copy.
// own_message=true (inside addOwnChannelMsg): this is our own post,
// so it must never bump the channel's unread badge even though the
// device's own UI isn't necessarily showing this channel right now
// (unlike an on-device compose, which is always looking at the
// channel it just sent to).
if (_ui) {
char entry[MAX_TEXT_LEN + 8]; // "Me: " + text
int tlen = len - i;
if (tlen > MAX_TEXT_LEN) tlen = MAX_TEXT_LEN;
snprintf(entry, sizeof(entry), "Me: %.*s", tlen, text);
// own_message=true: this is our own post, so it must never bump the
// channel's unread badge even though the device's own UI isn't
// necessarily showing this channel right now (unlike an on-device
// compose, which is always looking at the channel it just sent to).
int pos = _ui->addChannelMsg(channel_idx, entry, msg_timestamp, nullptr, 0, true);
int pos = _ui->addOwnChannelMsg(channel_idx, text, tlen, msg_timestamp);
// Same "relayed into mesh" marker an on-device channel send arms (see
// MessagesScreen::afterSend): sendGroupMessage above already went
// through sendFloodScoped(GroupChannel&, ...), which calls