From 452135b30414899b65010069deee3d8b2dbb39ff Mon Sep 17 00:00:00 2001
From: Piotr Tanski <piotr.tanski@mudita.com>
Date: Mon, 23 Nov 2020 09:03:24 +0100
Subject: [PATCH] [EGD-4373] Fix for changing the content of option window.
 (#1054)

---
 changelog.md                                  |  1 +
 .../ApplicationMessages.cpp                   |  2 +-
 module-apps/windows/OptionWindow.cpp          | 20 ++++++++++++-------
 module-apps/windows/OptionWindow.hpp          |  5 +++--
 module-apps/windows/OptionsWindowOption.hpp   |  6 +++++-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/changelog.md b/changelog.md
index 644b2b9066e614c1ddfb458dbec4c06f83f32489..3a337500f4466a1008f2e0d6a5cff6bf6123fff7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,7 @@
 ### Fixed
 
 * `[desktop]` Fixed ScreenlockCheckEvent handler 
+* `[messages]` Fix for changing the content of option windows when forwarding a message.
 
 ### Changed
 
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index 06dd2ad8c170bf91833b7b4663f8d2a4eaf5b631..211281b1f1065ad57d59be73d2fb757e184e1916 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -385,7 +385,7 @@ namespace app
 
     bool ApplicationMessages::newMessageOptions(const std::string &requestingWindow, gui::Text *text)
     {
-        LOG_INFO("New message options");
+        LOG_INFO("New message options for %s", requestingWindow.c_str());
         auto opts = std::make_unique<gui::OptionsWindowOptions>(newMessageWindowOptions(this, requestingWindow, text));
         switchWindow(utils::localize.get("app_phonebook_options_title"), std::move(opts));
         return true;
diff --git a/module-apps/windows/OptionWindow.cpp b/module-apps/windows/OptionWindow.cpp
index c90674565fb8d28948f66d528bdc9bc0b59aec93..a94e13d6eb34f84b15d493e0a6453a89efcab799 100644
--- a/module-apps/windows/OptionWindow.cpp
+++ b/module-apps/windows/OptionWindow.cpp
@@ -36,18 +36,24 @@ namespace gui
         body->addWidget(Option(text, activatedCallback, arrow).build());
     }
 
-    void OptionWindow::addOptions(std::list<Option> &options)
+    void OptionWindow::addOptions(std::list<Option> &optionList)
     {
-        for (auto &option : options) {
+        for (auto &option : optionList) {
             body->addWidget(option.build());
         }
         body->switchPage(0);
     }
 
-    void OptionWindow::addOptions(std::list<Option> &&options)
+    void OptionWindow::addOptions(std::list<Option> &&optionList)
     {
-        this->options = std::move(options);
-        addOptions(this->options);
+        options = std::move(optionList);
+        addOptions(options);
+    }
+
+    void OptionWindow::resetOptions(std::list<Option> &&optionList)
+    {
+        clearOptions();
+        addOptions(std::move(optionList));
     }
 
     void OptionWindow::clearOptions()
@@ -84,6 +90,7 @@ namespace gui
     void OptionWindow::destroyInterface()
     {
         erase();
+        body = nullptr;
     }
 
     OptionWindow::~OptionWindow()
@@ -95,8 +102,7 @@ namespace gui
     {
         if (auto message = dynamic_cast<gui::OptionsWindowOptions *>(data)) {
             LOG_DEBUG("Options load!");
-            options = message->takeOptions();
-            addOptions(options);
+            resetOptions(message->takeOptions());
         }
     }
 } /* namespace gui */
diff --git a/module-apps/windows/OptionWindow.hpp b/module-apps/windows/OptionWindow.hpp
index cb3a54472275b1d77cecfe218842aea7aa509607..23b087dd6a7898feecaa3b412f00c10d2dac6015 100644
--- a/module-apps/windows/OptionWindow.hpp
+++ b/module-apps/windows/OptionWindow.hpp
@@ -17,8 +17,9 @@ namespace gui
       protected:
         PageLayout *body = nullptr;
         std::list<Option> options;
-        void addOptions(std::list<Option> &options);
-        void addOptions(std::list<Option> &&options);
+        void addOptions(std::list<Option> &optionList);
+        void addOptions(std::list<Option> &&optionList);
+        void resetOptions(std::list<Option> &&optionList);
 
       public:
         OptionWindow(app::Application *app, const std::string &name);
diff --git a/module-apps/windows/OptionsWindowOption.hpp b/module-apps/windows/OptionsWindowOption.hpp
index 5d6a5174777915ed12b1207e9719be9c2c1501d6..eaf3aa1cbea13a228e18f884aef58ed672e672cf 100644
--- a/module-apps/windows/OptionsWindowOption.hpp
+++ b/module-apps/windows/OptionsWindowOption.hpp
@@ -28,7 +28,7 @@ namespace gui
             [[nodiscard]] virtual auto str() const -> std::string
             {
                 return "";
-            };
+            }
         };
 
         class Simple : public Base
@@ -44,6 +44,10 @@ namespace gui
             {}
 
             [[nodiscard]] auto build() const -> Item * override;
+            [[nodiscard]] auto str() const -> std::string override
+            {
+                return text;
+            }
         };
     }; // namespace option