~aleteoryx/muditaos

3bd82762f2806d8a8dda0ceeb52224c0680d54e2 — Piotr Tański 4 years ago 8e056fd
[EGD-7475] Fixed a crash on phonebook search

The phone crashed if a user put a special char to the search engine.
M module-apps/application-phonebook/data/PhonebookItemData.hpp => module-apps/application-phonebook/data/PhonebookItemData.hpp +0 -13
@@ 31,19 31,6 @@ class PhonebookItemData : public gui::SwitchData
    }
};

class PhonebookSearchQuery : public gui::SwitchData
{
  public:
    explicit PhonebookSearchQuery(std::string searchQuery) : searchQuery(std::move(searchQuery)){};
    const std::string &getQuery() const noexcept
    {
        return searchQuery;
    }

  protected:
    std::string searchQuery;
};

class PhonebookSearchResultsData : public gui::SwitchData
{
  public:

M module-apps/application-phonebook/windows/PhonebookSearch.cpp => module-apps/application-phonebook/windows/PhonebookSearch.cpp +0 -20
@@ 36,26 36,6 @@ namespace gui
        setFocusItem(inputField);
    }

    auto PhonebookSearch::handleSwitchData(SwitchData *data) -> bool
    {
        if (data == nullptr) {
            LOG_ERROR("Received null pointer");
            return false;
        }

        auto item = dynamic_cast<PhonebookSearchQuery *>(data);
        assert(item != nullptr);
        inputField->setText(item->getQuery());

        return true;
    }

    void PhonebookSearch::onBeforeShow(ShowMode mode, SwitchData *data)
    {
        inputField->clear();
        setFocusItem(inputField);
    }

    auto PhonebookSearch::onInput(const InputEvent &inputEvent) -> bool
    {
        if (AppWindow::onInput(inputEvent)) {

M module-apps/application-phonebook/windows/PhonebookSearch.hpp => module-apps/application-phonebook/windows/PhonebookSearch.hpp +0 -2
@@ 16,8 16,6 @@ namespace gui

      private:
        void buildInterface() override;
        auto handleSwitchData(SwitchData *data) -> bool override;
        void onBeforeShow(ShowMode mode, SwitchData *data) override;
        auto onInput(const InputEvent &inputEvent) -> bool override;

        std::shared_ptr<ContactRecord> contact = nullptr;