Fix Prevent issue

[platform/framework/web/wrt.git] / src / view / common / view_logic_certificate_support.cpp

diff --git a/src/view/common/view_logic_certificate_support.cpp b/src/view/common/view_logic_certificate_support.cpp
index a375f19..9cd535e 100644 (file)
--- a/src/view/common/view_logic_certificate_support.cpp
+++ b/src/view/common/view_logic_certificate_support.cpp
@@ -25,6 +25,7 @@
 #include <memory>
 #include <Evas.h>
 #include <Elementary.h>
+#include <efl_assist.h>
 #include <dpl/log/log.h>
 #include <dpl/log/secure_log.h>
 #include <dpl/unused.h>
@@ -51,22 +52,29 @@ static void deleteCallback(void* data, Evas* e, Evas_Object* obj, void* eventInf
 {
     _D("called");
 
-    DPL_UNUSED_PARAM(data);
+    Assert(obj);
+
     DPL_UNUSED_PARAM(e);
     DPL_UNUSED_PARAM(eventInfo);
 
-    Assert(obj);
+    CallbackData* callbackData = static_cast<CallbackData*>(data);
+    if (callbackData) {
+        ea_object_event_callback_del(obj, EA_CALLBACK_BACK, callbackData->eaKeyCallback);
+        delete callbackData;
+    }
     evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE, resizeCallback);
 }
+
 static void resizeCallback(void* data, Evas* e, Evas_Object* obj, void* eventInfo)
 {
     _D("called");
 
+    Assert(obj);
+
     DPL_UNUSED_PARAM(data);
     DPL_UNUSED_PARAM(e);
     DPL_UNUSED_PARAM(eventInfo);
 
-    Assert(obj);
     Evas_Object* popup = obj;
     int popupH;
     evas_object_geometry_get(popup, 0, 0, 0, &popupH);
@@ -154,8 +162,8 @@ Evas_Object* CertificateSupportUtil::createPopup(
     Evas_Object* window,
     const char* bodyText,
     const char* checkText,
-    Evas_Smart_Cb
-    buttonCallback,
+    Evas_Smart_Cb buttonCallback,
+    Evas_Smart_Cb keyCallback,
     void* data)
 {
     LogDebug("createPopup");
@@ -163,7 +171,13 @@ Evas_Object* CertificateSupportUtil::createPopup(
     Evas_Object* parentWindow = PopupUtil::getParentWindow(window);
     Evas_Object* popup = elm_popup_add(parentWindow);
 
-    evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, deleteCallback, NULL);
+    CallbackData* callbackData = NULL;
+    if (keyCallback) {
+        callbackData = new CallbackData;
+        callbackData->eaKeyCallback = keyCallback;
+        ea_object_event_callback_add(popup, EA_CALLBACK_BACK, keyCallback, data);
+    }
+    evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, deleteCallback, static_cast<void*>(callbackData));
     evas_object_event_callback_add(popup, EVAS_CALLBACK_RESIZE, resizeCallback, NULL);
 
     elm_object_style_set(popup, "popup/default");