Fixed calendar appcontrol

Change-Id: I99b4b20b2a8ad5865997f4aef1ee3b7f19174dd6
Signed-off-by: Hosang Kim <hosang.kim@samsung.com>

diff --git a/src/calendar-app-control/CalendarAppControlDllEntry.cpp b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
index 4ac2c95..ad0722f 100644 (file)
--- a/src/calendar-app-control/CalendarAppControlDllEntry.cpp
+++ b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
@@ -50,6 +50,7 @@ extern "C" {
 static const wchar_t CALENDAR_ITEM_TYPE[] = L"http://tizen.org/appcontrol/data/social/item_type";
 static const wchar_t CALENDAR_RESULT_TYPE[] = L"http://tizen.org/appcontrol/data/social/result_type";
 static const wchar_t CALENDAR_ITEM_ID[] = L"http://tizen.org/appcontrol/data/social/item_id";
+static const wchar_t CALENDAR_SELECTION_MODE[] = L"http://tizen.org/appcontrol/data/selection_mode";
 
 
 result _OSP_EXPORT_ StartAppControl(int req, const String&, const String&, const String*, const String*, const IMap*);
@@ -138,13 +139,32 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                pCb = OnAppControlResultTizen;
                operation = L"http://tizen.org/appcontrol/operation/social/pick";
 
-               msg.AddData(CALENDAR_ITEM_TYPE, L"event");
+               const String& tmpItemType = msg.GetValue(L"itemType");
+               if (!tmpItemType.IsEmpty())
+               {
+                       msg.AddData(CALENDAR_ITEM_TYPE, tmpItemType);
+               }
+               else if (aId == L"tizen.todo")
+               {
+                       msg.AddData(CALENDAR_ITEM_TYPE, L"todo");
+               }
+               else
+               {
+                       msg.AddData(CALENDAR_ITEM_TYPE, L"event");
+               }
+
+               const String& tmpSelMode = msg.GetValue(L"selectionMode");
+               if (!tmpSelMode.IsEmpty())
+               {
+                       msg.AddData(CALENDAR_SELECTION_MODE, tmpSelMode);
+               }
 
-               const String& tmp = msg.GetValue(L"itemType");
-               if (!tmp.IsEmpty())
+               const String& tmpResultType = msg.GetValue(CALENDAR_RESULT_TYPE);
+               if (tmpResultType.IsEmpty())
                {
-                       msg.AddData(CALENDAR_RESULT_TYPE, tmp);
+                       msg.AddData(CALENDAR_RESULT_TYPE, L"vcs");
                }
+
        }
        else if (isCalendarEdit)
        {
@@ -179,7 +199,19 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
 
                        operation = L"http://tizen.org/appcontrol/operation/social/view";
 
-                       msg.AddData(CALENDAR_ITEM_TYPE, L"event");
+                       const String& tmpItemType = msg.GetValue(L"itemType");
+                       if (!tmpItemType.IsEmpty())
+                       {
+                               msg.AddData(CALENDAR_ITEM_TYPE, tmpItemType);
+                       }
+                       else if (aId == L"tizen.todo")
+                       {
+                               msg.AddData(CALENDAR_ITEM_TYPE, L"todo");
+                       }
+                       else
+                       {
+                               msg.AddData(CALENDAR_ITEM_TYPE, L"event");
+                       }
 
                        const String& tmp = msg.GetValue(L"eventId");
                        if (!tmp.IsEmpty())