remove lunchapp

Change-Id: I1bef47e61c4c786157d9008a347f67783502f0ed
Signed-off-by: Hyunseok Yang <hs0219.yang@samsung.com>

diff --git a/src/controls/FWebCtrl_IWebEventListener.h b/src/controls/FWebCtrl_IWebEventListener.h
index 14114c6..9a9fdaa 100755 (executable)
--- a/src/controls/FWebCtrl_IWebEventListener.h
+++ b/src/controls/FWebCtrl_IWebEventListener.h
@@ -40,8 +40,6 @@ class _IWebEventListener
 {
 public:
        virtual ~_IWebEventListener(void) {};
-
-       virtual result LaunchAppControl(const Tizen::Base::Runtime::IEventArg& arg) = 0;
        virtual result OnHandleJavaScriptRequestByEventArg(const Tizen::Base::Runtime::IEventArg& arg) = 0;
        virtual result OnHandleLoadingEvent(const Tizen::Base::Runtime::IEventArg& arg) = 0;
        virtual result OnHandleWebDownloadEvent(const Tizen::Base::Runtime::IEventArg& arg) = 0;

diff --git a/src/controls/FWebCtrl_WebEvent.cpp b/src/controls/FWebCtrl_WebEvent.cpp
index ad2f1af..59cd4bf 100755 (executable)
--- a/src/controls/FWebCtrl_WebEvent.cpp
+++ b/src/controls/FWebCtrl_WebEvent.cpp
@@ -75,7 +75,7 @@ _WebEvent::FireImpl(Tizen::Base::Runtime::IEventListener& listener, const Tizen:
        switch (eventGroup)
        {
        case WEB_EVENT_REQUEST_SERVICE:
-               r = pWebListener->LaunchAppControl(arg);
+//             r = pWebListener->LaunchAppControl(arg);
                break;
 
        case WEB_EVENT_DELIVER_JSBRIDGE_REQUEST:

diff --git a/src/controls/FWebCtrl_WebImpl.cpp b/src/controls/FWebCtrl_WebImpl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 28fed3f..cd8f5ab
--- a/src/controls/FWebCtrl_WebImpl.cpp
+++ b/src/controls/FWebCtrl_WebImpl.cpp
@@ -943,35 +943,23 @@ OnLoadingRequested(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
                result r = E_SUCCESS;
 
-               _WebEventType eventType = WEB_EVENT_REQUEST_UNKNOWN;
-
-               if (uriScheme == L"rtsp")
-               {
-                       eventType = WEB_EVENT_REQUEST_RTSP;
-               }
-               else if (uriScheme == L"mailto")
-               {
-                       eventType = WEB_EVENT_REQUEST_EMAIL;
-               }
-               else if (uriScheme == L"tel")
+               if (uriScheme == L"tel")
                {
-                       eventType = WEB_EVENT_REQUEST_TEL;
+                       String operationId(L"http://tizen.org/appcontrol/operation/dial");
+                       r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-               else if (uriScheme == L"sms" || uriScheme == L"smsto" )
+               else if (uriScheme == L"mailto" || uriScheme == L"sms" || uriScheme == L"smsto" || uriScheme == L"mms" || uriScheme == L"mmsto" )
                {
-                       eventType = WEB_EVENT_REQUEST_SMS;
+                       String operationId(L"http://tizen.org/appcontrol/operation/compose");
+                       r = _AppControlImpl::FindAndStart(operationId, &url, null, null, null, null);
                }
-               else if (uriScheme == L"mms" || uriScheme == L"mmsto" )
+               else
                {
-                       eventType = WEB_EVENT_REQUEST_MMS;
+                       String operationId(L"http://tizen.org/appcontrol/operation/view");
+                       String mime(ewk_policy_decision_response_mime_get(pPolicy));
+                       r = _AppControlImpl::FindAndStart(operationId, &url, &mime, null, null, null);
                }
-
-               std::unique_ptr<_WebEventArg> pEventArg(new _WebEventArg(eventType, url));
-               SysTryReturnVoidResult(NID_WEB_CTRL, pEventArg.get(), E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
-
-               r = pImpl->GetWebEvent()->FireAsync(*pEventArg.get());
                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-               pEventArg.release();
 
                return;
        }
@@ -1077,7 +1065,6 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
 
        String url(ewk_policy_decision_url_get(pPolicy));
 
-       
        if (pLoadingListener && ewk_frame_is_main_frame(ewk_policy_decision_frame_get(pPolicy)))
        {
                const Eina_Hash* pHeader = ewk_policy_decision_response_headers_get(pPolicy);
@@ -1119,70 +1106,35 @@ OnWebDataReceived(void* pUserData, Evas_Object* pView, void* pEventInfo)
                
                else
                {
-                       SysLog(NID_WEB_CTRL, "Launch native app to handle the mime");
-
                        ewk_policy_decision_ignore(pPolicy);
 
-                       AppControl* pAppControl = null;
                        _SelectBox selectBox;
-                       int appCount = 0;
                        int selectedIndex = 0;
+                       String operationId(L"http://tizen.org/appcontrol/operation/view");
 
-                       std::unique_ptr<IList, AllElementsDeleter> pList(_AppManagerImpl::FindAppControlsN(NULL, NULL, &mime, NULL));
-
-                       if (pList.get())
-                       {
-                               appCount = pList->GetCount();
-                       }
-
-                       r = selectBox.Construct(false, L"", appCount+1); //+1 for Downloader
-                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                       selectBox.AddListItem(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_DOWNLOAD"), _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
-                       for (int i = 0; i < appCount; i++)
-                       {
-                               pAppControl = dynamic_cast< AppControl* >(pList->GetAt(i));
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAppControl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               String text = pAppControl->GetAppName();
-                               SysLog(NID_WEB_CTRL, "AppName : %S", text.GetPointer());
-
-                               selectBox.AddListItem(text, _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
-                       }
-                       r = selectBox.ShowAndWait(selectedIndex);
-                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-
-                       if (selectedIndex == 0) //download
-                       {
-                               RequestId reqId = 0;
-                               DownloadRequest request(pUrl);
-
-                               _DownloadManagerImpl* pManagerImpl = _DownloadManagerImpl::GetInstance();
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pManagerImpl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
-
-                               r = pManagerImpl->Start(request, reqId);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
-                       }
-                       else if (selectedIndex != -1) // -1 for cancel
+                       r = _AppControlImpl::FindAndStart(operationId, &url, &mime, null, null, null);
+                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS || r == E_OBJ_NOT_FOUND, r, "[%s] Propagating.", GetErrorMessage(r));
+       
+                       if (r == E_OBJ_NOT_FOUND)
                        {
-                               String path("path");
-                               String pathVal(pUrl);
-
-                               HashMap dataList;
-                               r = dataList.Construct();
+                               r = selectBox.Construct(false, L"Select application", 1); //+1 for Downloader
                                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-                               r = dataList.Add(path, pathVal);
+                               selectBox.AddListItem(pSysResource->GetString(_RESOURCE_DOMAIN_ID_OSP, "IDS_BR_BODY_DOWNLOAD"), _SelectBox::LIST_ITEM_TYPE_NORMAL, false);
+                               r = selectBox.ShowAndWait(selectedIndex);
                                SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-                               pAppControl = dynamic_cast< AppControl* >(pList->GetAt(selectedIndex));
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAppControl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+                               if (selectedIndex == 0) //download
+                               {
+                                       RequestId reqId = 0;
+                                       DownloadRequest request(pUrl);
 
-                               _AppControlImpl* pAcImpl = _AppControlImpl::GetInstance(*pAppControl);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, pAcImpl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+                                       _DownloadManagerImpl* pManagerImpl = _DownloadManagerImpl::GetInstance();
+                                       SysTryReturnVoidResult(NID_WEB_CTRL, pManagerImpl, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
-                               r = pAcImpl->Start(null, null, &dataList, null);
-                               SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+                                       r = pManagerImpl->Start(request, reqId);
+                                       SysTryReturnVoidResult(NID_WEB_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+                               }
                        }
 
                        return;
@@ -4082,75 +4034,6 @@ _WebImpl::IsOrientationChanged(void) const
 
 
 result
-_WebImpl::LaunchAppControl(const IEventArg& arg)
-{
-       result r = E_SUCCESS;
-
-       IEventArg* pArg = const_cast< IEventArg* >(&arg);
-       _WebEventArg* pWebEventArg = dynamic_cast< _WebEventArg* >(pArg);
-       SysTryReturnResult(NID_WEB_CTRL, pWebEventArg, E_INVALID_ARG, "Type casting failed. argument must be IEventArg type.");
-
-       String operationId(L"");
-       String uriPattern(pWebEventArg->GetEventMessage());
-       SysLog(NID_WEB_CTRL, "The current value of web event type is %d", pWebEventArg->GetEventType());
-
-       switch (pWebEventArg->GetEventType())
-       {
-       case WEB_EVENT_REQUEST_RTSP:
-       {
-               String ext;
-               String mimeType;
-               int uriLength = uriPattern.GetLength();
-               int index;
-
-               operationId = L"http://tizen.org/appcontrol/operation/view";
-
-               r = uriPattern.LastIndexOf(L".", uriLength - 1, index);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = uriPattern.SubString(index + 1, ext);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = _AppControlManager::GetMimeFromExt(ext, mimeType);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               r = _AppControlImpl::FindAndStart(operationId, &uriPattern, &mimeType, null, null, null);
-               SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-               return r;
-       }
-       case WEB_EVENT_REQUEST_TEL:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/dial";
-               break;
-       }
-       case WEB_EVENT_REQUEST_EMAIL:
-       //fall through
-       case WEB_EVENT_REQUEST_SMS:
-       //fall through
-       case WEB_EVENT_REQUEST_MMS:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/compose";
-               break;
-       }
-       case WEB_EVENT_REQUEST_UNKNOWN:
-       {
-               operationId = L"http://tizen.org/appcontrol/operation/view";
-               break;
-       }
-       default:
-               SysAssert(false);
-               break;
-       }
-
-       r = _AppControlImpl::FindAndStart(operationId, &uriPattern, null, null, null, null);
-       SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       return r;
-}
-
-
-result
 _WebImpl::SetFullScreenKeypad(void)
 {
        result r = E_SUCCESS;

diff --git a/src/controls/FWebCtrl_WebImpl.h b/src/controls/FWebCtrl_WebImpl.h
index 7a61ef8..a2bf268 100755 (executable)
--- a/src/controls/FWebCtrl_WebImpl.h
+++ b/src/controls/FWebCtrl_WebImpl.h
@@ -426,7 +426,6 @@ private:
        result InitWebEvent(void);
 
        IJavaScriptBridge* FindJsInterface(const Tizen::Web::Json::IJsonValue* pValue) const;
-       result LaunchAppControl(const Tizen::Base::Runtime::IEventArg& arg);
 
        result ShowAuthenticationPopup(const Tizen::Base::String& host, const Tizen::Base::String& realm, AuthenticationChallenge* pAuthChallenge);