From 0974e41f70f55b029b76348c7279751b48d9ce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kamo=C5=84?= <70628259+mkamonMdt@users.noreply.github.com> Date: Wed, 4 Nov 2020 07:47:46 +0100 Subject: [PATCH] [EGD-2778] fixed missing phone number Phone number was missing in delete message thread confirmation window for threads with temporary contacts --- changelog.md | 3 ++- .../application-messages/ApplicationMessages.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 9e248d460c17cfa811ede57539a8b14e6b4ef050..80f0e7c3f465be95027de95812c649df666e98bc 100644 --- a/changelog.md +++ b/changelog.md @@ -18,11 +18,12 @@ ### Fixed +* `[GUI][messages]` Fixed not showing number on deleting temporary contact * `[GUI]` Fixed filling Label with color ## [0.44.1 2020-10-30] -### Added +### Addedgit * `[settings][bluetooth]` Add "Phone name" window. * `[cellular]` Add support for modem reset. diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp index f3225cc8624609204cfa019160c2222d8c56c1c0..1ea785aedf1f5e3040b51fac7233cf5fafce024e 100644 --- a/module-apps/application-messages/ApplicationMessages.cpp +++ b/module-apps/application-messages/ApplicationMessages.cpp @@ -185,16 +185,16 @@ namespace app } LOG_DEBUG("Removing thread: %" PRIu32, record->ID); - auto query = std::make_unique(record->contactID); + auto query = std::make_unique(record->contactID, true); query->setQueryListener(db::QueryCallback::fromFunction([this, record](auto response) { auto result = dynamic_cast(response); if (result != nullptr) { const auto &contact = result->getResult(); gui::DialogMetadata meta; - meta.action = [this, record]() { return onRemoveSmsThreadConfirmed(*record); }; - meta.text = utils::localize.get("app_messages_thread_delete_confirmation"); - meta.title = contact.getFormattedName(); - meta.icon = "phonebook_contact_delete_trashcan"; + meta.action = [this, record]() { return onRemoveSmsThreadConfirmed(*record); }; + meta.text = utils::localize.get("app_messages_thread_delete_confirmation"); + meta.title = contact.getFormattedName(); + meta.icon = "phonebook_contact_delete_trashcan"; switchWindow(gui::name::window::dialog_yes_no, std::make_unique(meta)); return true; }