~aleteoryx/muditaos: [MOS-97] Fix of wrong label for missed call notification

425d23e454e09fd6ae274b00f8d19c57a577aa94 — Alek Rudnik 3 years ago 63ae4d6

[MOS-97] Fix of wrong label for missed call notification

There was no label on missed call notification from private number.
After fix it is diplaying "Missed calls" info.

Original fix from 60bdca524338025dc0117edcc5c5579376441b0b [MOS-104]
was also modifed as it previously introduced regression on menu window.

patch browse .tar.gz

3 files changed, 6 insertions(+), 3 deletions(-)

M module-apps/application-calllog/ApplicationCallLog.cpp
M module-apps/application-calllog/windows/CallLogMainWindow.cpp
M module-apps/apps-common/notifications/NotificationsListPresenter.cpp

M module-apps/application-calllog/ApplicationCallLog.cpp => module-apps/application-calllog/ApplicationCallLog.cpp +3 -1

@@ 133,7 133,9 @@ namespace app
         DBServiceAPI::GetQuery(this,
                                db::Interface::Name::Notifications,
                                std::make_unique<db::query::notifications::Clear>(NotificationsRecord::Key::Calls));
-        return true;
+        const auto [succeed, _] = DBServiceAPI::GetQuery(
+            this, db::Interface::Name::Calllog, std::make_unique<db::query::calllog::SetAllRead>());
+        return succeed;
     }
 
 } /* namespace app */

M module-apps/application-calllog/windows/CallLogMainWindow.cpp => module-apps/application-calllog/windows/CallLogMainWindow.cpp +2 -1

@@ 164,7 164,8 @@ namespace gui
     {
         auto notification = dynamic_cast<db::NotificationMessage *>(msg);
         if (notification != nullptr) {
-            if (notification->interface == db::Interface::Name::Calllog && notification->dataModified()) {
+            if (notification->interface == db::Interface::Name::Calllog &&
+                notification->type == db::Query::Type::Create) {
                 rebuild();
                 return true;
             }

M module-apps/apps-common/notifications/NotificationsListPresenter.cpp => module-apps/apps-common/notifications/NotificationsListPresenter.cpp +1 -1

@@ 12,7 12,7 @@ namespace
                              const notifications::NotificationWithContact *notification,
                              const std::string &text)
     {
-        if (notification->hasRecord()) {
+        if (notification->hasRecord() && !notification->getRecord().getFormattedName().empty()) {
             const auto &record = notification->getRecord();
             item->setName(record.getFormattedName());
         }