Add sanitization

1. Check if AppContext stack is empty before calling presenter's
callback
2. Unregister from smart callbacks in Widget destructor

Change-Id: I716c0dde5d43f3b7bc3527c2dd591dbe41e5ab5b

diff --git a/src/main.cpp b/src/main.cpp
index 212259b..8ce74f1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,11 +29,13 @@ static bool on_app_create(void *priv)
 }
 
 static void on_app_terminate(void *priv)
-{
-}
+{}
 
 static void on_app_pause(void *priv)
 {
+       if (Singleton<AppContext>::instance().empty())
+               return;
+
        auto p = Singleton<AppContext>::instance().back();
        if (p)
                p->onAppPause();
@@ -41,6 +43,9 @@ static void on_app_pause(void *priv)
 
 static void on_app_resume(void *priv)
 {
+       if (Singleton<AppContext>::instance().empty())
+               return;
+
        auto p = Singleton<AppContext>::instance().back();
        if (p)
                p->onAppResume();

diff --git a/src/presenter/AppContext.cpp b/src/presenter/AppContext.cpp
index d0c7395..e75205f 100644 (file)
--- a/src/presenter/AppContext.cpp
+++ b/src/presenter/AppContext.cpp
@@ -24,9 +24,17 @@ void AppContext::pop()
 {
        navContext_.popView();
        presentersStack_.pop_back();
+
+       if (presentersStack_.empty())
+               ui_app_exit();
 }
 
 Presenter *AppContext::back()
 {
        return presentersStack_.back().get();
 }
+
+bool AppContext::empty()
+{
+       return presentersStack_.empty();
+}

diff --git a/src/presenter/AppContext.hpp b/src/presenter/AppContext.hpp
index d3ef7f2..6633439 100644 (file)
--- a/src/presenter/AppContext.hpp
+++ b/src/presenter/AppContext.hpp
@@ -18,6 +18,7 @@ class AppContext
        void push(std::unique_ptr<Presenter> presenter);
        void pop();
        Presenter *back();
+       bool empty();
 
        // TODO: should be private
        UniversalSwitchDbusConfig config;

diff --git a/src/ui/Widget.cpp b/src/ui/Widget.cpp
index d3c922c..b806122 100644 (file)
--- a/src/ui/Widget.cpp
+++ b/src/ui/Widget.cpp
@@ -6,6 +6,13 @@ Widget::Widget(Widget *parent)
        : parent_(parent)
 {}
 
+Widget::~Widget()
+{
+       for (auto &it : smartCallbacks_) {
+               evas_object_smart_callback_del(getObject(), it.first.c_str(), smartCallbackMethod);
+       }
+}
+
 void Widget::setText(const TranslatedString &text)
 {
        elm_object_text_set(uniqueObj_.get(), text.c_str());
@@ -57,8 +64,7 @@ void Widget::setEvasSmartCallback(const std::string &eventName, std::function<vo
 {
        auto cbData = std::make_unique<WidgetCallback::Data<Widget, std::string>>(this, eventName);
        auto dataPtr = cbData.get();
-       smartCallbacks_.insert_or_assign(
-               eventName, WidgetCallback::Value<Widget, std::string>{std::move(callback), std::move(cbData)});
+       smartCallbacks_.insert_or_assign(eventName, WidgetCallback::Value<Widget, std::string>{std::move(callback), std::move(cbData)});
        evas_object_smart_callback_add(getObject(), eventName.c_str(), smartCallbackMethod, dataPtr);
 }
 

diff --git a/src/ui/Widget.hpp b/src/ui/Widget.hpp
index 73acccc..53b0bf6 100644 (file)
--- a/src/ui/Widget.hpp
+++ b/src/ui/Widget.hpp
@@ -19,7 +19,7 @@ class Widget
        public:
        Widget(const Widget &) = delete;
        Widget(Widget &&) = delete;
-       virtual ~Widget() = default;
+       virtual ~Widget();
 
        template <typename T, typename... Args>
        static T *make(Widget *parent, Args &&... args)