Fix AppControl spec

Change-Id: I3ea03c8cbb43388f99453d02d80b0773c01c93f8
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>

diff --git a/inc/GlAlbumListPresentationModel.h b/inc/GlAlbumListPresentationModel.h
index c4c28d1..1f5ce73 100644 (file)
--- a/inc/GlAlbumListPresentationModel.h
+++ b/inc/GlAlbumListPresentationModel.h
@@ -60,8 +60,8 @@ public:
        void CancelThumbnailRequest(const int folderIndex);
        void ClearThumbnailRequests(bool appTerminating = false);
        result StartAppControl(const Tizen::Base::String&  providerId, const Tizen::Base::String&  operationId,
-                       const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pDataList,
-                       Tizen::App::IAppControlResponseListener* pListener);
+                       const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
+                       const Tizen::Base::Collection::HashMap* pDataList, Tizen::App::IAppControlResponseListener* pListener);
 
        void InitializeAlbumInfoList(const Tizen::Content::ContentType& contentType);
        result DeleteContentInfoInDirectory(int index, Tizen::Content::ContentType contentType);
@@ -79,7 +79,6 @@ public:
 
        virtual void OnThumbnailReceivedN(Tizen::Base::Runtime::IEventArg& eventArg);
 
-       //From IContentScanListener
        virtual void OnContentScanCompleted (RequestId reqId, const Tizen::Base::String &scanPath, result r);
 
        void OnContentCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r);

diff --git a/inc/GlFileListForm.h b/inc/GlFileListForm.h
index e6cd941..594b55e 100644 (file)
--- a/inc/GlFileListForm.h
+++ b/inc/GlFileListForm.h
@@ -28,8 +28,8 @@
 #include <FUi.h>
 #include "GlBaseForm.h"
 #include "GlFormContentUpdateEventListener.h"
-#include "GlSlideShowPopUp.h"
 #include "GlSlideSettingListener.h"
+#include "GlSlideShowPopUp.h"
 
 class FileListPresentationModel;
 class ISlideSettingListener;

diff --git a/inc/GlFileListPresentationModel.h b/inc/GlFileListPresentationModel.h
index 03fa8ba..9b4ea5a 100644 (file)
--- a/inc/GlFileListPresentationModel.h
+++ b/inc/GlFileListPresentationModel.h
@@ -67,8 +67,8 @@ public:
        result MoveToContentFileList(const Tizen::Base::Collection::IList& contentIndexList,
                        const Tizen::Base::String& destDirectory);
        result StartAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String&  operationId,
-                       const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pDataList,
-                       Tizen::App::IAppControlResponseListener* pListener);
+                       const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
+                       const Tizen::Base::Collection::HashMap* pDataList, Tizen::App::IAppControlResponseListener* pListener);
        result SetCurrentAlbumInfo(const Tizen::Base::String& albumName,
                        const Tizen::Base::Collection::IList& directoryList);
        result RefreshCurrentAlbumContentInfoList(Tizen::Content::ContentType contentType);

diff --git a/inc/GlTypes.h b/inc/GlTypes.h
index c0cd70d..608e345 100644 (file)
--- a/inc/GlTypes.h
+++ b/inc/GlTypes.h
@@ -193,14 +193,17 @@ extern const wchar_t* APPCONTROL_KEY_DATA_SELECTED;
 extern const wchar_t* APPCONTROL_KEY_MESSAGE_TYPE;
 extern const wchar_t* APPCONTROL_KEY_CAMERA_ALLOW_SWITCH;
 
+extern const wchar_t* APPCONTROL_URI_MMS_TO;
+extern const wchar_t* APPCONTROL_URI_MAIL_TO;
+
 extern const wchar_t* APPCONTROL_MIME_IMAGE_JPG;
+extern const wchar_t* APPCONTROL_MIME_IMAGE_ALL;
 
 extern const wchar_t* APPCONTROL_DATA_IMAGE;
 extern const wchar_t* APPCONTROL_DATA_VIDEO;
 extern const wchar_t* APPCONTROL_DATA_SINGLE;
 extern const wchar_t* APPCONTROL_DATA_MULTIPLE;
 extern const wchar_t* APPCONTROL_DATA_SLIDE_SHOW;
-extern const wchar_t* APPCONTROL_DATA_MMS;
 extern const wchar_t* APPCONTROL_DATA_SELECTION_MODE;
 extern const wchar_t* APPCONTROL_DATA_TRUE;
 

diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp
index d89b288..b537d29 100644 (file)
--- a/src/GlAlbumListEditorForm.cpp
+++ b/src/GlAlbumListEditorForm.cpp
@@ -686,11 +686,10 @@ AlbumListEditorForm::OnRequestMessage(void)
 
                HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
                pDataList->Construct();
-               pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_MESSAGE_TYPE), new (std::nothrow) String(APPCONTROL_DATA_MMS));
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE,
-                               null, pDataList, null);
+                               new (std::nothrow) String(APPCONTROL_URI_MMS_TO), null, pDataList, null);
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -754,8 +753,8 @@ AlbumListEditorForm::OnRequestEmail(void)
                pDataList->Construct();
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-               __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL,
-                               APPCONTROL_OPERATION_ID_COMPOSE, null, pDataList, null);
+               __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE,
+                               new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index 7ed2122..24d57b0 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -359,8 +359,8 @@ AlbumListForm::OnActionPerformed(const Control& source, int actionId)
                                        new (std::nothrow) String(APPCONTROL_DATA_TRUE));
 
                        __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA,
-                                       APPCONTROL_OPERATION_ID_CREATE_CONTENT, new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG),
-                                       pDataList, null);
+                                       APPCONTROL_OPERATION_ID_CREATE_CONTENT, null,
+                                       new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
                }
                break;
        case ACTION_ID_FOOTER_EDIT:

diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp
index 6043788..65e5048 100644 (file)
--- a/src/GlAlbumListPresentationModel.cpp
+++ b/src/GlAlbumListPresentationModel.cpp
@@ -499,7 +499,8 @@ AlbumListPresentationModel::CreateMergeBitmapN(int index)
 
 result
 AlbumListPresentationModel::StartAppControl(const String&  providerId, const String&  operationId,
-               const String* pMimeType, const IMap* pDataList, IAppControlResponseListener* pListener)
+               const String* pUriData, const String* pMimeType, const IMap* pDataList,
+               IAppControlResponseListener* pListener)
 {
        AppLogDebug("ENTER");
        AppControl* pAc = AppManager::FindAppControlN(providerId, operationId);
@@ -509,7 +510,7 @@ AlbumListPresentationModel::StartAppControl(const String&  providerId, const Str
 
                return E_FAILURE;
        }
-       result r = pAc->Start(null, pMimeType, pDataList, pListener);
+       result r = pAc->Start(pUriData, pMimeType, pDataList, pListener);
 
        if (r == E_SUCCESS)
        {

diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp
index dfed3fe..9fa810a 100644 (file)
--- a/src/GlAllListEditorPanel.cpp
+++ b/src/GlAllListEditorPanel.cpp
@@ -631,12 +631,10 @@ AllListEditorPanel::OnRequestMessage(void)
 
        HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
        pDataList->Construct();
-       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_MESSAGE_TYPE),
-                       new (std::nothrow) String(APPCONTROL_DATA_MMS));
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MMS_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -674,8 +672,8 @@ AllListEditorPanel::OnRequestEmail(void)
        pDataList->Construct();
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;
@@ -714,7 +712,7 @@ AllListEditorPanel::OnRequestSlideShow(void)
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
        __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
-                       pDataList, null);
+                       new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
 
        delete pIndexList;
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));

diff --git a/src/GlAllListPanel.cpp b/src/GlAllListPanel.cpp
index f04733d..8362065 100644 (file)
--- a/src/GlAllListPanel.cpp
+++ b/src/GlAllListPanel.cpp
@@ -251,9 +251,9 @@ AllListPanel::OnIconListViewItemStateChanged(IconListView& view, int index, Icon
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_INDEX), new (std::nothrow) String(listIndex));
 
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
-                               pDataList, null);
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
 
-               String* temp;
+               String* temp = null;
                loopCount = pArrayList->GetCount();
                for (int i = 0; i < loopCount; ++i)
                {

diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp
index 76b82ec..df30312 100644 (file)
--- a/src/GlAllListSelectionPanel.cpp
+++ b/src/GlAllListSelectionPanel.cpp
@@ -543,12 +543,10 @@ AllListSelectionPanel::OnRequestMessage(void)
 
        HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
        pDataList->Construct();
-       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_MESSAGE_TYPE),
-                       new (std::nothrow) String(APPCONTROL_DATA_MMS));
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MMS_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 
        return E_SUCCESS;

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 0a20719..f385405 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -1055,8 +1055,7 @@ FileListEditorForm::SelectAllPressed(void)
 void
 FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
 {
-
-       if ( __pPopUp != NULL)
+       if (__pPopUp != NULL)
        {
                __pPopUp->SetShowState(false);
        }
@@ -1083,7 +1082,6 @@ FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
                                pSelectionPanel->OnRequestSlideShow();
                        }
                }
-
        }
        else if (index == 1) // go to settingsForm
        {
@@ -1091,7 +1089,5 @@ FileListEditorForm::OnSlideSettingPopUpItemSelected(int index)
                TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager", GetErrorMessage(GetLastResult()));
 
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SETTING_MAIN));
-
        }
 }
-

diff --git a/src/GlFileListForm.cpp b/src/GlFileListForm.cpp
index e2cbac3..93a6457 100644 (file)
--- a/src/GlFileListForm.cpp
+++ b/src/GlFileListForm.cpp
@@ -178,7 +178,7 @@ FileListForm::OnActionPerformed(const Control& source, int actionId)
                pDataList->Construct();
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_CAMERA_ALLOW_SWITCH), new (std::nothrow) String(APPCONTROL_DATA_TRUE));
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA, APPCONTROL_OPERATION_ID_CREATE_CONTENT,
-                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
+                               null, new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
                break;
        }
        default:
@@ -274,8 +274,7 @@ FileListForm::SetTitleText(const String& titleText)
 void
 FileListForm::OnSlideSettingPopUpItemSelected(int index)
 {
-
-       if ( __pPopUp != NULL)
+       if (__pPopUp != NULL)
        {
                __pPopUp->SetShowState(false);
        }
@@ -297,7 +296,6 @@ FileListForm::OnSlideSettingPopUpItemSelected(int index)
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW,null, pDataList, null);
-
        }
        else if (index == 1) // go to settingsForm
        {
@@ -305,6 +303,5 @@ FileListForm::OnSlideSettingPopUpItemSelected(int index)
                TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager", GetErrorMessage(GetLastResult()));
 
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SETTING_MAIN));
-
        }
 }

diff --git a/src/GlFileListPresentationModel.cpp b/src/GlFileListPresentationModel.cpp
index 8aeca8f..d668e4f 100644 (file)
--- a/src/GlFileListPresentationModel.cpp
+++ b/src/GlFileListPresentationModel.cpp
@@ -84,7 +84,7 @@ IList* FileListPresentationModel::__pContentInfoList = null;
 FileListPresentationModel::FileListPresentationModel(void)
        : __albumContentType(CONTENT_TYPE_ALL)
        , __appControlMode(APP_CONTROL_MODE_MAIN)
-       , __appControlMediaType(APPCONTROL_MEDIA_TYPE_UNKNOWN)
+       , __appControlMediaType(APPCONTROL_MEDIA_TYPE_IMAGE)
        , __appControlSelectionMode(APPCONTROL_SELECTION_MODE_SINGLE)
 {
        AppLogDebug("ENTER");
@@ -1016,7 +1016,8 @@ FileListPresentationModel::MoveToContentFile(const ContentId& contentId, const S
 
 result
 FileListPresentationModel::StartAppControl(const String& providerId, const String& operationId,
-               const Tizen::Base::String* pMimeType, const IMap* pDataList, IAppControlResponseListener* pListener)
+               const String* pUriData, const Tizen::Base::String* pMimeType, const HashMap* pDataList,
+               IAppControlResponseListener* pListener)
 {
        AppLogDebug("ENTER");
        AppControl* pAc = AppManager::FindAppControlN(providerId, operationId);
@@ -1025,7 +1026,7 @@ FileListPresentationModel::StartAppControl(const String& providerId, const Strin
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
                return E_FAILURE;
        }
-       result r = pAc->Start(null, pMimeType, pDataList, pListener);
+       result r = pAc->Start(pUriData, pMimeType, pDataList, pListener);
 
        if (r == E_SUCCESS)
        {

diff --git a/src/GlImageListEditorPanel.cpp b/src/GlImageListEditorPanel.cpp
index a648823..10d92d4 100644 (file)
--- a/src/GlImageListEditorPanel.cpp
+++ b/src/GlImageListEditorPanel.cpp
@@ -666,11 +666,10 @@ ImageListEditorPanel::OnRequestMessage(void)
 
        HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
        pDataList->Construct();
-       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_MESSAGE_TYPE), new (std::nothrow) String(APPCONTROL_DATA_MMS));
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MMS_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -699,8 +698,8 @@ ImageListEditorPanel::OnRequestEmail(void)
        pDataList->Construct();
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -711,7 +710,6 @@ ImageListEditorPanel::OnRequestMoveTo(String& destDirectory)
        if (&destDirectory == null || destDirectory.IsEmpty())
        {
                AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult()));
-
                return;
        }
 
@@ -719,7 +717,6 @@ ImageListEditorPanel::OnRequestMoveTo(String& destDirectory)
        if (pIndexList == null || pIndexList->GetCount() <= 0)
        {
                AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult()));
-
                return;
        }
 

diff --git a/src/GlImageListPanel.cpp b/src/GlImageListPanel.cpp
index 54dbc89..ca811f5 100644 (file)
--- a/src/GlImageListPanel.cpp
+++ b/src/GlImageListPanel.cpp
@@ -232,7 +232,7 @@ ImageListPanel::OnIconListViewItemStateChanged(IconListView& view, int index, Ic
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_INDEX), new (std::nothrow) String(listIndex));
 
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
-                               pDataList, null);
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }

diff --git a/src/GlTypes.cpp b/src/GlTypes.cpp
index 2849135..be800a6 100644 (file)
--- a/src/GlTypes.cpp
+++ b/src/GlTypes.cpp
@@ -85,14 +85,17 @@ const wchar_t* APPCONTROL_KEY_DATA_SELECTED = L"http://tizen.org/appcontrol/data
 const wchar_t* APPCONTROL_KEY_MESSAGE_TYPE = L"http://tizen.org/appcontrol/data/message/type";
 const wchar_t* APPCONTROL_KEY_CAMERA_ALLOW_SWITCH = L"http://tizen.org/appcontrol/data/camera/allow_switch";
 
+const wchar_t* APPCONTROL_URI_MMS_TO = L"mmsto";
+const wchar_t* APPCONTROL_URI_MAIL_TO = L"mailto";
+
 const wchar_t* APPCONTROL_MIME_IMAGE_JPG = L"image/jpg";
+const wchar_t* APPCONTROL_MIME_IMAGE_ALL = L"image/*";
 
 const wchar_t* APPCONTROL_DATA_IMAGE = L"image";
 const wchar_t* APPCONTROL_DATA_VIDEO = L"video";
 const wchar_t* APPCONTROL_DATA_SINGLE = L"single";
 const wchar_t* APPCONTROL_DATA_MULTIPLE = L"multiple";
 const wchar_t* APPCONTROL_DATA_SLIDE_SHOW = L"slideshow";
-const wchar_t* APPCONTROL_DATA_MMS = L"mms";
 const wchar_t* APPCONTROL_DATA_SELECTION_MODE = L"http://tizen.org/appcontrol/data/selection/mode";
 const wchar_t* APPCONTROL_DATA_TRUE = L"true";
 

diff --git a/src/GlVideoListEditorPanel.cpp b/src/GlVideoListEditorPanel.cpp
index f3fd6da..c286522 100644 (file)
--- a/src/GlVideoListEditorPanel.cpp
+++ b/src/GlVideoListEditorPanel.cpp
@@ -807,11 +807,10 @@ VideoListEditorPanel::OnRequestMessage(void)
 
        HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
        pDataList->Construct();
-       pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_MESSAGE_TYPE), new (std::nothrow) String(APPCONTROL_DATA_MMS));
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MMS_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
@@ -839,8 +838,8 @@ VideoListEditorPanel::OnRequestEmail(void)
        pDataList->Construct();
        pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_PATH), (Object*)pArrayList);
 
-       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL,     APPCONTROL_OPERATION_ID_COMPOSE, null,
-                       pDataList, null);
+       __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL,     APPCONTROL_OPERATION_ID_COMPOSE,
+                       new (std::nothrow) String(APPCONTROL_URI_MAIL_TO), null, pDataList, null);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 

diff --git a/src/GlVideoListPanel.cpp b/src/GlVideoListPanel.cpp
index e0c9942..c043de8 100644 (file)
--- a/src/GlVideoListPanel.cpp
+++ b/src/GlVideoListPanel.cpp
@@ -243,7 +243,7 @@ VideoListPanel::OnListViewItemStateChanged(ListView& listView, int index, int el
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_INDEX), new (std::nothrow) String(listIndex));
 
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_IMAGE, APPCONTROL_OPERATION_ID_VIEW, null,
-                               pDataList, null);
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_ALL), pDataList, null);
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }