pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 15:02:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'develop' into refactor-nodedb

Browse Source
This commit is contained in:
Jonathan Bennett 2025-10-16 14:40:23 -05:00 committed by GitHub
commit 0f4210d2e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/CannedMessageModule.cpp
View File

@ -255,7 +255,7 @@ void CannedMessageModule::updateDestinationSelectionList()
for (size_t i = 0; i < numMeshNodes; ++i) { for (size_t i = 0; i < numMeshNodes; ++i) {
meshtastic_NodeInfoLite *node = nodeDB->getMeshNodeByIndex(i); meshtastic_NodeInfoLite *node = nodeDB->getMeshNodeByIndex(i);
if (!node || node->num == myNodeNum) if (!node || node->num == myNodeNum || !node->has_user || node->user.public_key.size != 32)
continue; continue;
const String &nodeName = node->user.long_name; const String &nodeName = node->user.long_name;
@ -976,6 +976,8 @@ void CannedMessageModule::sendText(NodeNum dest, ChannelIndex channel, const cha
LOG_INFO("Proactively adding %x as favorite node", p->to); LOG_INFO("Proactively adding %x as favorite node", p->to);
nodeDB->set_favorite(true, p->to); nodeDB->set_favorite(true, p->to);
screen->setFrames(graphics::Screen::FOCUS_PRESERVE); screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
p->pki_encrypted = true;
p->channel = 0;
} }
// Send to mesh and phone (even if no phone connected, to track ACKs) // Send to mesh and phone (even if no phone connected, to track ACKs)