rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

trunk fix

Browse Source
This commit is contained in:
HarukiToreda
2025-11-10 01:43:34 -05:00
parent 9441f0c143
commit 46391ff5e3
2 changed files with 18 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MessageStore.cpp
View File

@@ -332,9 +332,7 @@ void MessageStore::deleteOldestMessageInChannel(uint8_t channel)
void MessageStore::deleteAllMessagesInChannel(uint8_t channel) void MessageStore::deleteAllMessagesInChannel(uint8_t channel)
{ {
auto pred = [channel](const StoredMessage &m) { auto pred = [channel](const StoredMessage &m) { return m.type == MessageType::BROADCAST && m.channelIndex == channel; };
return m.type == MessageType::BROADCAST && m.channelIndex == channel;
};
eraseIf(liveMessages, pred, false /* delete ALL, not just first */); eraseIf(liveMessages, pred, false /* delete ALL, not just first */);
saveToFlash(); saveToFlash();
} }

61
src/graphics/draw/MenuHandler.cpp
View File

@@ -534,11 +534,9 @@ void menuHandler::replyMenu()
auto mode = graphics::MessageRenderer::getThreadMode(); auto mode = graphics::MessageRenderer::getThreadMode();
if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) { if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) {
bannerOptions.message = "Reply to Channel"; bannerOptions.message = "Reply to Channel";
} } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
bannerOptions.message = "Reply to DM"; bannerOptions.message = "Reply to DM";
} } else {
else {
// View All // View All
bannerOptions.message = "Reply to Last Msg"; bannerOptions.message = "Reply to Last Msg";
} }
@@ -548,7 +546,6 @@ void menuHandler::replyMenu()
bannerOptions.optionsCount = options; bannerOptions.optionsCount = options;
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.bannerCallback = [](int selected) -> void {
auto mode = graphics::MessageRenderer::getThreadMode(); auto mode = graphics::MessageRenderer::getThreadMode();
int ch = graphics::MessageRenderer::getThreadChannel(); int ch = graphics::MessageRenderer::getThreadChannel();
uint32_t peer = graphics::MessageRenderer::getThreadPeer(); uint32_t peer = graphics::MessageRenderer::getThreadPeer();
@@ -571,14 +568,9 @@ void menuHandler::replyMenu()
} else { } else {
// Fallback for last received message // Fallback for last received message
if (devicestate.rx_text_message.to == NODENUM_BROADCAST) { if (devicestate.rx_text_message.to == NODENUM_BROADCAST) {
cannedMessageModule->LaunchWithDestination( cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST, devicestate.rx_text_message.channel);
NODENUM_BROADCAST,
devicestate.rx_text_message.channel
);
} else { } else {
cannedMessageModule->LaunchWithDestination( cannedMessageModule->LaunchWithDestination(devicestate.rx_text_message.from);
devicestate.rx_text_message.from
);
} }
} }
@@ -597,14 +589,9 @@ void menuHandler::replyMenu()
} else { } else {
// Fallback for last received message // Fallback for last received message
if (devicestate.rx_text_message.to == NODENUM_BROADCAST) { if (devicestate.rx_text_message.to == NODENUM_BROADCAST) {
cannedMessageModule->LaunchFreetextWithDestination( cannedMessageModule->LaunchFreetextWithDestination(NODENUM_BROADCAST, devicestate.rx_text_message.channel);
NODENUM_BROADCAST,
devicestate.rx_text_message.channel
);
} else { } else {
cannedMessageModule->LaunchFreetextWithDestination( cannedMessageModule->LaunchFreetextWithDestination(devicestate.rx_text_message.from);
devicestate.rx_text_message.from
);
} }
} }
@@ -620,29 +607,11 @@ void menuHandler::deleteMessagesMenu()
auto mode = graphics::MessageRenderer::getThreadMode(); auto mode = graphics::MessageRenderer::getThreadMode();
#if defined(M5STACK_UNITC6L) #if defined(M5STACK_UNITC6L)
static const char *optionsArrayAll[] = { static const char *optionsArrayAll[] = {"Back", "Delete Oldest", "Delete All"};
"Back", static const char *optionsArrayNormal[] = {"Back", "Delete Oldest", "Delete This Chat", "Delete All"};
"Delete Oldest",
"Delete All"
};
static const char *optionsArrayNormal[] = {
"Back",
"Delete Oldest",
"Delete This Chat",
"Delete All"
};
#else #else
static const char *optionsArrayAll[] = { static const char *optionsArrayAll[] = {"Back", "Delete Oldest", "Delete All Chats"};
"Back", static const char *optionsArrayNormal[] = {"Back", "Delete Oldest", "Delete This Chat", "Delete All Chats"};
"Delete Oldest",
"Delete All Chats"
};
static const char *optionsArrayNormal[] = {
"Back",
"Delete Oldest",
"Delete This Chat",
"Delete All Chats"
};
#endif #endif
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
@@ -658,7 +627,6 @@ void menuHandler::deleteMessagesMenu()
} }
bannerOptions.bannerCallback = [mode](int selected) -> void { bannerOptions.bannerCallback = [mode](int selected) -> void {
int ch = graphics::MessageRenderer::getThreadChannel(); int ch = graphics::MessageRenderer::getThreadChannel();
uint32_t peer = graphics::MessageRenderer::getThreadPeer(); uint32_t peer = graphics::MessageRenderer::getThreadPeer();
@@ -679,11 +647,9 @@ void menuHandler::deleteMessagesMenu()
if (mode == graphics::MessageRenderer::ThreadMode::ALL) { if (mode == graphics::MessageRenderer::ThreadMode::ALL) {
messageStore.deleteOldestMessage(); messageStore.deleteOldestMessage();
} } else if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) {
else if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) {
messageStore.deleteOldestMessageInChannel(ch); messageStore.deleteOldestMessageInChannel(ch);
} } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
messageStore.deleteOldestMessageWithPeer(peer); messageStore.deleteOldestMessageWithPeer(peer);
} }
@@ -695,8 +661,7 @@ void menuHandler::deleteMessagesMenu()
if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) { if (mode == graphics::MessageRenderer::ThreadMode::CHANNEL) {
messageStore.deleteAllMessagesInChannel(ch); messageStore.deleteAllMessagesInChannel(ch);
} } else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
else if (mode == graphics::MessageRenderer::ThreadMode::DIRECT) {
messageStore.deleteAllMessagesWithPeer(peer); messageStore.deleteAllMessagesWithPeer(peer);
} }