chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #114: stored messages are stored and retreived with the base callsign

Browse Source
This commit is contained in:
Jordan Sherer 2019-02-07 13:43:35 -05:00
parent 24004b805c
commit 845022c9bd
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mainwindow.cpp
View File

@ -10029,7 +10029,7 @@ void MainWindow::processCommandActivity() {
cd.snr = d.snr; cd.snr = d.snr;
cd.tdrift = d.tdrift; cd.tdrift = d.tdrift;
cd.text = text; cd.text = text;
cd.to = to; cd.to = Radio::base_callsign(to);
cd.utcTimestamp = d.utcTimestamp; cd.utcTimestamp = d.utcTimestamp;
qDebug() << "storing message to" << to << ":" << text; qDebug() << "storing message to" << to << ":" << text;
@ -10134,7 +10134,7 @@ void MainWindow::processCommandActivity() {
auto from = params.value("FROM").toString().trimmed(); auto from = params.value("FROM").toString().trimmed();
auto to = params.value("TO").toString().trimmed(); auto to = params.value("TO").toString().trimmed();
if(to != who){ if(to != who && to != Radio::base_callsign(who)){
continue; continue;
} }
@ -10391,8 +10391,17 @@ int MainWindow::getNextMessageIdForCallsign(QString callsign){
return -1; return -1;
} }
auto v = inbox.values("STORE", "$.params.TO", callsign, 0, 10); auto v1 = inbox.values("STORE", "$.params.TO", callsign, 0, 10);
foreach(auto pair, v){ foreach(auto pair, v1){
auto params = pair.second.params();
auto text = params.value("TEXT").toString().trimmed();
if(!text.isEmpty()){
return pair.first;
}
}
auto v2 = inbox.values("STORE", "$.params.TO", Radio::base_callsign(callsign), 0, 10);
foreach(auto pair, v2){
auto params = pair.second.params(); auto params = pair.second.params();
auto text = params.value("TEXT").toString().trimmed(); auto text = params.value("TEXT").toString().trimmed();
if(!text.isEmpty()){ if(!text.isEmpty()){