mirror/MuditaOS
1
0
Fork 0
mirror of https://github.com/mudita/MuditaOS.git synced 2026-07-18 12:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

[MOS-962] Fix forwarded message automatic pasting

Browse Source 
Fix of the issue that entering 'Options' menu
after forwarding message caused the content
of the message to be pasted into message
field in thread view.
Minor cleanup.
This commit is contained in:
Lefucjusz
2023-03-20 17:24:43 +01:00
committed by Marcin Łyda
parent a870922ec3
commit 2a901acf0b
5 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
module-apps/application-messages/windows/SMSThreadViewWindow.cpp
View File

@@ -8,12 +8,9 @@
#include "service-appmgr/Controller.hpp"
#include <log/log.hpp>
#include <module-db/queries/notifications/QueryNotificationsDecrement.hpp>
#include <module-db/queries/phonebook/QueryContactGetByNumberID.hpp>
#include <module-db/queries/phonebook/QueryNumberGetByID.hpp>
#include <OptionsMessages.hpp>
#include <service-db/DBNotificationMessage.hpp>
#include <service-db/DBServiceAPI.hpp>
#include <Service/Message.hpp>
#include <Style.hpp>
#include <TextBubble.hpp>
@@ -85,11 +82,14 @@ namespace gui
requestContact(smsModel->numberID);
}
if (auto pdata = dynamic_cast<SMSTextData *>(data); pdata) {
auto txt = pdata->text;
if (const auto pdata = dynamic_cast<SMSTextData *>(data); pdata != nullptr) {
LOG_INFO("received sms templates data");
pdata->concatenate == SMSTextData::Concatenate::True ? smsModel->smsInput->inputText->addText(txt)
: smsModel->smsInput->inputText->setText(txt);
if (pdata->concatenate == SMSTextData::Concatenate::True) {
smsModel->smsInput->inputText->addText(pdata->text);
}
else {
smsModel->smsInput->inputText->setText(pdata->text);
}
}
}
@@ -120,20 +120,15 @@ namespace gui
bool SMSThreadViewWindow::onDatabaseMessage(sys::Message *msgl)
{
auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
const auto msg = dynamic_cast<db::NotificationMessage *>(msgl);
if (msg != nullptr) {
if (msg->interface == db::Interface::Name::SMS) {
if (msg->dataModified()) {
rebuild();
return true;
}
if ((msg->interface == db::Interface::Name::SMS) && msg->dataModified()) {
rebuild();
return true;
}
if (msg->interface == db::Interface::Name::SMSThread) {
if (msg->type == db::Query::Type::Delete) {
if (this == application->getCurrentWindow()) {
application->switchWindow(gui::name::window::main_window);
}
}
if ((msg->interface == db::Interface::Name::SMSThread) && (msg->type == db::Query::Type::Delete) &&
(this == application->getCurrentWindow())) {
application->switchWindow(gui::name::window::main_window);
}
}
return false;