From 3cf2185d15e60cb3b1ceaa18fbaf43369436716d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ta=C5=84ski?= Date: Thu, 29 Jul 2021 18:09:33 +0200 Subject: [PATCH] [EGD-7226] Removed contacts blocking feature Contacts blocking is not yet implemented. Removed the feature from the UI. --- .../windows/PhonebookContactOptions.cpp | 44 ------------------- .../windows/PhonebookContactOptions.hpp | 1 - 2 files changed, 45 deletions(-) diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp index b8581462aef1ae4f97dc268dbb647cdf870b4891..d5c836caca4b86faec8da5db803f138a672e9663 100644 --- a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp +++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp @@ -55,18 +55,6 @@ namespace gui return true; }, gui::option::Arrow::Enabled}); - if (contact->isOnBlocked()) { - options.emplace_back(gui::Option{utils::translate("app_phonebook_options_unblock"), [=](gui::Item &item) { - LOG_INFO("Unblocking contact!"); - return contactBlock(false); - }}); - } - else { - options.emplace_back(gui::Option{utils::translate("app_phonebook_options_block"), [=](gui::Item &item) { - LOG_INFO("Blocking contact!"); - return contactBlock(true); - }}); - } options.emplace_back(gui::Option{utils::translate("app_phonebook_options_delete"), [=](gui::Item &item) { LOG_INFO("Deleting contact!"); return contactRemove(); @@ -74,38 +62,6 @@ namespace gui return options; } - auto PhonebookContactOptions::contactBlock(bool shouldBeBlocked) -> bool - { - LOG_DEBUG("Blocking contact: %" PRIu32, contact->ID); - std::string dialogText; - - if (shouldBeBlocked) { - dialogText = utils::translate("app_phonebook_options_block_confirm"); - } - else { - dialogText = utils::translate("app_phonebook_options_unblock_confirm"); - } - - auto contactRec = DBServiceAPI::ContactGetByID(this->application, contact->ID); - auto cont = !contactRec->empty() ? contactRec->front() : ContactRecord{}; - - auto metaData = std::make_unique( - gui::DialogMetadata{cont.getFormattedName(), "block_W_G", dialogText, "", [=]() -> bool { - contact->addToBlocked(shouldBeBlocked); - DBServiceAPI::ContactUpdate(this->application, *contact); - if (shouldBeBlocked) { - showNotification(NotificationType::Block); - } - else { - showNotification(NotificationType::Unblock); - } - return true; - }}); - - application->switchWindow(gui::window::name::dialog_yes_no, std::move(metaData)); - return true; - } - auto PhonebookContactOptions::contactRemove() -> bool { LOG_DEBUG("Removing contact: %" PRIu32, contact->ID); diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp index 81d2f78afa7579083cf84e1533b4a56d0afdc9e9..035f883572d5830be0a041a1a2177afc6cd5bf26 100644 --- a/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp +++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp @@ -25,7 +25,6 @@ namespace gui }; std::shared_ptr contact = nullptr; auto contactOptionsList() -> std::list; - auto contactBlock(bool shouldBeBlocked) -> bool; auto contactRemove() -> bool; auto showNotification(NotificationType notificationType) -> bool; };