Bug TT-68 Remove private ewk_*_permission_request_* APIs from browser code

    [Issue#]   https://bugs.tizen.org/jira/browse/TT-68
    [Problem]  ewk_*_permission_request_* APIs persist in the code
    [Cause]    -
    [Solution] Remove the permission request api calls from the code.
    [Verify]   This modification can be tested using files attached
               in bugzilla.

Change-Id: I2e0514e1db8f063b27b2cb316e7a9224487315c6
Signed-off-by: k.lis2 <k.lis2@samsung.com>

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 7e514ccae3c20f438c1b84b4d550217396d59020..575502d9a593ee50f59001863931b0d708c047d0 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -606,7 +606,7 @@ void SimpleUI::onReturnPressed(MenuButton *m)
     m->hidePopup();
 }
 
-void SimpleUI::setwvIMEStatus(bool status) 
+void SimpleUI::setwvIMEStatus(bool status)
 {
     BROWSER_LOGD("[%s]", __func__);
     m_wvIMEStatus = status;
@@ -859,8 +859,9 @@ void SimpleUI::tabClicked(const tizen_browser::basic_webengine::TabId& tabId)
 
 void SimpleUI::handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation)
 {
-    std::cerr<<"Web confirmation signal received"<<std::endl;
-    switch(webConfirmation->getConfirmationType()) {
+    BROWSER_LOGD("%s", __func__);
+    switch(webConfirmation->getConfirmationType())
+    {
         case basic_webengine::WebConfirmation::ConfirmationType::Authentication:
         {
         basic_webengine::AuthenticationConfirmationPtr auth = std::dynamic_pointer_cast<basic_webengine::AuthenticationConfirmation, basic_webengine::WebConfirmation>(webConfirmation);
@@ -898,14 +899,21 @@ void SimpleUI::handleConfirmationRequest(basic_webengine::WebConfirmationPtr web
         popup->setData(popupData);
         popup->buttonClicked.connect(boost::bind(&SimpleUI::authPopupButtonClicked, this, _1, _2));
         popup->show();
-        }
         break;
+        }
+
         case basic_webengine::WebConfirmation::ConfirmationType::CertificateConfirmation:
+        case basic_webengine::WebConfirmation::ConfirmationType::Geolocation:
+        case basic_webengine::WebConfirmation::ConfirmationType::UserMedia:
+        case basic_webengine::WebConfirmation::ConfirmationType::Notification:
         {
+        // Implicitly accepted
+        BROWSER_LOGE("NOT IMPLEMENTED: popups to confirm Ceritificate, Geolocation, UserMedia, Notification");
         webConfirmation->setResult(tizen_browser::basic_webengine::WebConfirmation::ConfirmationResult::Confirmed);
         m_webEngine->confirmationResult(webConfirmation);
         break;
         }
+
     default:
         break;
     }

diff --git a/services/WebKitEngineService/WebView.cpp b/services/WebKitEngineService/WebView.cpp
index 7cb53f088f8f04383eafe8dc163bb5d65691efa2..141f1e7823248cb58d48e58d6e66dbffc38e0d04 100644 (file)
--- a/services/WebKitEngineService/WebView.cpp
+++ b/services/WebKitEngineService/WebView.cpp
@@ -326,7 +326,8 @@ void WebView::confirmationResult(WebConfirmationPtr confirmation)
             break;
         }
         // set geolocation permission
-        ewk_geolocation_permission_request_set(request, result );
+        ewk_geolocation_permission_reply(request, result);
+        ewk_view_resume(m_ewkView);
 
         // remove from map
         m_confirmationGeolocationMap.erase(confirmation);
@@ -345,7 +346,8 @@ void WebView::confirmationResult(WebConfirmationPtr confirmation)
         };
 
         // set usermedia permission
-        ewk_user_media_permission_request_set(request, result);
+        ewk_user_media_permission_reply(request, result);
+        ewk_view_resume(m_ewkView);
 
         // remove from map
         m_confirmationUserMediaMap.erase(confirmation);
@@ -364,7 +366,8 @@ void WebView::confirmationResult(WebConfirmationPtr confirmation)
         }
 
         // set notification permission
-        ewk_notification_permission_request_set(request, result);
+        ewk_notification_permission_reply(request, result);
+        ewk_view_resume(m_ewkView);
 
         // remove from map
         m_confirmationNotificationMap.erase(confirmation);
@@ -728,7 +731,7 @@ void WebView::__geolocationPermissionRequest(void * data, Evas_Object * /* obj *
         return;
 
     // suspend webview
-    ewk_geolocation_permission_request_suspend(request);
+    ewk_view_suspend(self->m_ewkView);
 
     std::string url = WebView::securityOriginToUri(ewk_geolocation_permission_request_origin_get(request));
 
@@ -755,7 +758,7 @@ void WebView::__usermediaPermissionRequest(void * data, Evas_Object * /* obj */,
         return;
 
     // suspend webview
-    ewk_user_media_permission_request_suspend(request);
+    ewk_view_suspend(self->m_ewkView);
 
     ///\todo add translations
     std::string message = "User media permission request";
@@ -780,14 +783,12 @@ void WebView::__notificationPermissionRequest(void * data, Evas_Object * /* obj
         return;
 
     // suspend webview
-    ewk_notification_permission_request_suspend(request);
-
-    std::string url = WebView::securityOriginToUri(ewk_notification_permission_request_origin_get(request));
+    ewk_view_suspend(self->m_ewkView);
 
     ///\todo add translations
-    std::string message = (boost::format("%1% wants to display notifications") % url).str();
+    std::string message = (boost::format("%1% wants to display notifications") % self->getURI()).str();
 
-    WebConfirmationPtr c = std::make_shared<WebConfirmation>(WebConfirmation::ConfirmationType::Notification, self->m_tabId, url, message);
+    WebConfirmationPtr c = std::make_shared<WebConfirmation>(WebConfirmation::ConfirmationType::Notification, self->m_tabId, self->getURI(), message);
 
     // store
     self->m_confirmationNotificationMap[c] = request;