Change to implicit appcontrol launch

Change-Id: I7f1983f3149f2ed26610e7888d0fece66ee89d5f

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index 1c58c94..e72de6c 100755 (executable)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -460,6 +460,7 @@ EventDeleterForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 bool
 EventDeleterForm::DeleteGroupItem(int groupIndex, GroupItem* pItem, int itemWidth)
 {
+       AppLogDebug("Enter");
        delete pItem;
        return true;
 }
@@ -467,6 +468,7 @@ EventDeleterForm::DeleteGroupItem(int groupIndex, GroupItem* pItem, int itemWidt
 bool
 EventDeleterForm::DeleteItem(int groupIndex, int itemIndex, ListItemBase* pItem, int itemWidth)
 {
+       AppLogDebug("Enter");
        delete pItem;
        return true;
 }

diff --git a/src/ClSettingForm.cpp b/src/ClSettingForm.cpp
index 3c58860..6192245 100644 (file)
--- a/src/ClSettingForm.cpp
+++ b/src/ClSettingForm.cpp
@@ -188,7 +188,7 @@ SettingForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        switch (requestId)
        {
        case IDA_CALENDAR_SELECTOR_POPUP_DONE:
-               if (pArgs != null)
+               if (pArgs)
                {
                        __exportCalendarId = static_cast<Integer*>(pArgs->GetAt(0))->value;
 
@@ -207,16 +207,8 @@ SettingForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                        if (itemCount > 0)
                        {
                                String mimeType = MIME_TYPE_DIRECTORY;
-                               AppControl* pApp = AppManager::FindAppControlN(L"tizen.filemanager", ID_OPERATION_PICK);
-                               if (pApp != null)
-                               {
-                                       pApp->Start(null, &mimeType, null, this);
-                                       delete pApp;
-                               }
-
-                               // Todo: Change upper codes to below codes.
-//                             String mimeType = MIME_TYPE_DIRECTORY;
-//                             AppControl::FindAndStart(ID_OPERATION_PICK, null, &mimeType, null, null, this);
+                               result r = AppControl::FindAndStart(ID_OPERATION_PICK, null, &mimeType, null, null, this);
+                               AppLogDebug("[%s] Try to launch appcontrol.", GetErrorMessage(r));
                        }
                        else
                        {
@@ -260,7 +252,6 @@ void
 SettingForm::OnAppControlCompleteResponseReceived(const AppId& appId, const String& operationId,
                                                                                                  AppCtrlResult appControlResult, const IMap* pExtraData)
 {
-       AppLogDebug("Enter.");
        AppLogDebug("AppId : %ls", appId.GetPointer());
        AppLogDebug("OperationId : %ls", operationId.GetPointer());
 
@@ -569,25 +560,22 @@ SettingForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView, int
                        {
                        case IMPORT_EXPORT_ITEM_IMPORT:
                        {
-                               if (__pProgressPopup == null)
+                               String mimeType = MIME_TYPE_VCALENDAR;
+                               result r = AppControl::FindAndStart(ID_OPERATION_PICK, null, &mimeType, null, null, this);
+                               if (r == E_SUCCESS)
                                {
-                                       __pProgressPopup = new (std::nothrow) ProgressPopup();
-                                       __pProgressPopup->Construct(false, false);
+                                       if (!__pProgressPopup)
+                                       {
+                                               __pProgressPopup = new (std::nothrow) ProgressPopup();
+                                               __pProgressPopup->Construct(false, false);
+                                       }
+                                       __pProgressPopup->SetShowState(true);
+                                       __pProgressPopup->Show();
                                }
-                               __pProgressPopup->SetShowState(true);
-                               __pProgressPopup->Show();
-
-                               String mimeType = MIME_TYPE_VCALENDAR;
-                               AppControl* pApp = AppManager::FindAppControlN(AppId(L"tizen.filemanager"), ID_OPERATION_PICK);
-                               if (pApp != null)
+                               else
                                {
-                                       pApp->Start(null, &mimeType, null, this);
-                                       delete pApp;
+                                       AppLogDebug("[%s] Failed to launch appcontrol.", GetErrorMessage(r));
                                }
-
-                               // Todo: Change upper codes to below codes.
-//                             String mimeType = MIME_TYPE_VCALENDAR;
-//                             AppControl::FindAndStart(ID_OPERATION_PICK, null, &mimeType, null, null, this);
                                break;
                        }
                        case IMPORT_EXPORT_ITEM_EXPORT:

diff --git a/src/ClTypes.cpp b/src/ClTypes.cpp
index 1295aa8..3f133a7 100644 (file)
--- a/src/ClTypes.cpp
+++ b/src/ClTypes.cpp
@@ -241,7 +241,7 @@ const wchar_t* ID_OPERATION_SOCIAL_PICK = L"http://tizen.org/appcontrol/operatio
 const wchar_t* ID_OPERATION_SOCIAL_VIEW = L"http://tizen.org/appcontrol/operation/social/view";
 
 const wchar_t* MIME_TYPE_DIRECTORY = L"inode/directory";
-const wchar_t* MIME_TYPE_VCALENDAR = L"text/x-vcalendar";
+const wchar_t* MIME_TYPE_VCALENDAR = L"text/x-Vcalendar";
 
 const wchar_t* KEY_DATA_PATH = L"http://tizen.org/appcontrol/data/path";
 const wchar_t* KEY_DATA_SELECTED = L"http://tizen.org/appcontrol/data/selected";