pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 22:52:07 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix for dismissing channel frame when replied.

Browse Source
This commit is contained in:
HarukiToreda 2025-05-13 14:15:56 -04:00
parent 9cba2e7b7f
commit ace63eee8d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/Screen.cpp
View File

@ -4387,13 +4387,18 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
return 0; return 0;
} }
// Handles when message is received would jump to text message frame. // Handles when message is received; will jump to text message frame.
int Screen::handleTextMessage(const meshtastic_MeshPacket *packet) int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
{ {
if (showingNormalScreen) { if (showingNormalScreen) {
if (packet->from == 0) { if (packet->from == 0) {
// Outgoing message // Outgoing message (likely sent from phone)
setFrames(FOCUS_PRESERVE); // Stay on same frame, silently add/remove frames devicestate.has_rx_text_message = false;
memset(&devicestate.rx_text_message, 0, sizeof(devicestate.rx_text_message));
dismissedFrames.textMessage = true;
hasUnreadMessage = false; // Clear unread state when user replies
setFrames(FOCUS_PRESERVE); // Stay on same frame, silently update frame list
} else { } else {
// Incoming message // Incoming message
devicestate.has_rx_text_message = true; // Needed to include the message frame devicestate.has_rx_text_message = true; // Needed to include the message frame
@ -4412,7 +4417,6 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
String banner; String banner;
// Match bell character or exact alert text // Match bell character or exact alert text
// if (msg == "\x07" || msg.indexOf("Alert Bell Character") != -1) {
if (msg.indexOf("\x07") != -1) { if (msg.indexOf("\x07") != -1) {
banner = "Alert Received"; banner = "Alert Received";
} else { } else {