From 3bd82762f2806d8a8dda0ceeb52224c0680d54e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ta=C5=84ski?= <piotr.tanski@mudita.com>
Date: Fri, 8 Oct 2021 19:57:16 +0200
Subject: [PATCH] [EGD-7475] Fixed a crash on phonebook search

The phone crashed if a user put a special char to the search engine.
---
 .../data/PhonebookItemData.hpp                | 13 ------------
 .../windows/PhonebookSearch.cpp               | 20 -------------------
 .../windows/PhonebookSearch.hpp               |  2 --
 3 files changed, 35 deletions(-)

diff --git a/module-apps/application-phonebook/data/PhonebookItemData.hpp b/module-apps/application-phonebook/data/PhonebookItemData.hpp
index 9fe807afd3d9e063dec3d390028a9abe49c745c6..f9db08a874891578dbd35d82dd993c359371d12c 100644
--- a/module-apps/application-phonebook/data/PhonebookItemData.hpp
+++ b/module-apps/application-phonebook/data/PhonebookItemData.hpp
@@ -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:
diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.cpp b/module-apps/application-phonebook/windows/PhonebookSearch.cpp
index 1c465ad38b84709116ce2fb17824d5dcf1af46cf..a29e87e6a36ddf0f928e235c9c6a320b904c35b4 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearch.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearch.cpp
@@ -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)) {
diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.hpp b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
index ce3930781e95eea617376f0339a0610ae42b6c5b..ba9adb3cb15fcd8590dbfd9db956ec4cdf25bff5 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearch.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
@@ -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;