merge wrt-plugins-tizen_0.2.0-12

[profile/ivi/wrt-plugins-tizen.git] / src / standards / Tizen / Calendar / CalendarResponseDispatcher.cpp

diff --git a/src/standards/Tizen/Calendar/CalendarResponseDispatcher.cpp b/src/standards/Tizen/Calendar/CalendarResponseDispatcher.cpp
index 2516dc6..cbe90b5 100755 (executable)
--- a/src/standards/Tizen/Calendar/CalendarResponseDispatcher.cpp
+++ b/src/standards/Tizen/Calendar/CalendarResponseDispatcher.cpp
@@ -106,7 +106,15 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventAddEventsPtr &even
             LogDebug("result success");
             CalendarConverterFactory::ConverterType converter =
                 CalendarConverterFactory::getConverter(cbm->getContext());
-            cbm->callOnSuccess(converter->toJSValueRef(event->getEvents()));
+
+            JSValueRef result;
+            if (CalendarEvent::TASK_TYPE==event->getCalendarType()) {
+                result = converter->toJSValueRefTaskArray(event->getEvents());
+            } else {
+                result = converter->toJSValueRefEventArray(event->getEvents());
+            }
+
+            cbm->callOnSuccess(result);
             return;
         }
         LogDebug("result fail");
@@ -295,7 +303,12 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventFindEventsPtr &eve
             CalendarConverterFactory::ConverterType converter =
                 CalendarConverterFactory::getConverter(cbm->getContext());
 
-            JSValueRef result = converter->toJSValueRef(event->getEvents());
+            JSValueRef result;
+            if (CalendarEvent::TASK_TYPE==event->getCalendarType()) {
+                result = converter->toJSValueRefTaskArray(event->getEvents());
+            } else {
+                result = converter->toJSValueRefEventArray(event->getEvents());
+            }
             cbm->callOnSuccess(result);
             return;
         } else {
@@ -337,7 +350,7 @@ void CalendarResponseDispatcher::OnAnswerReceived(const IEventExpandEventRecurre
         if (event->getResult()) {
             CalendarConverterFactory::ConverterType converter =
                 CalendarConverterFactory::getConverter(cbm->getContext());
-            cbm->callOnSuccess(converter->toJSValueRef(event->getExpandedEventList()));
+            cbm->callOnSuccess(converter->toJSValueRefEventArray(event->getExpandedEventList()));
             return;
         } else {
             JSValueRef errorObject;
@@ -371,6 +384,7 @@ void CalendarResponseDispatcher::onAnswerReceived(const OnEventsChangedPtr& even
     JSContextRef context = multiCallbacks->getOnAdded()->getContext();
 
     CalendarConverterFactory::ConverterType converter = CalendarConverterFactory::getConverter(context);
+    JSValueRef result;
 
     Try
     {
@@ -378,12 +392,23 @@ void CalendarResponseDispatcher::onAnswerReceived(const OnEventsChangedPtr& even
         {
             case OnEventsChanged::ON_ADD:
             {
-                multiCallbacks->getOnAdded()->callOnSuccess(converter->toJSValueRef(event->getEventList()));
+                if (CalendarEvent::TASK_TYPE==event->getCalendarType()) {
+                    result = converter->toJSValueRefTaskArray(event->getEventList());
+                } else {
+                    result = converter->toJSValueRefEventArray(event->getEventList());
+                }
+
+                multiCallbacks->getOnAdded()->callOnSuccess(result);
                 break;
             }
             case OnEventsChanged::ON_UPDATE:
             {
-                multiCallbacks->getOnUpdated()->callOnSuccess(converter->toJSValueRef(event->getEventList()));
+                if (CalendarEvent::TASK_TYPE==event->getCalendarType()) {
+                    result = converter->toJSValueRefTaskArray(event->getEventList());
+                } else {
+                    result = converter->toJSValueRefEventArray(event->getEventList());
+                }
+                multiCallbacks->getOnUpdated()->callOnSuccess(result);
                 break;
             }
             case OnEventsChanged::ON_DELETE: