~aleteoryx/muditaos

3cf2185d15e60cb3b1ceaa18fbaf43369436716d — Piotr Tański 4 years ago cf019e3
[EGD-7226] Removed contacts blocking feature

Contacts blocking is not yet implemented.
Removed the feature from the UI.
M module-apps/application-phonebook/windows/PhonebookContactOptions.cpp => module-apps/application-phonebook/windows/PhonebookContactOptions.cpp +0 -44
@@ 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::DialogMetadataMessage>(
            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);

M module-apps/application-phonebook/windows/PhonebookContactOptions.hpp => module-apps/application-phonebook/windows/PhonebookContactOptions.hpp +0 -1
@@ 25,7 25,6 @@ namespace gui
        };
        std::shared_ptr<ContactRecord> contact = nullptr;
        auto contactOptionsList() -> std::list<gui::Option>;
        auto contactBlock(bool shouldBeBlocked) -> bool;
        auto contactRemove() -> bool;
        auto showNotification(NotificationType notificationType) -> bool;
    };