[OAuth2][NON-ACR][Changes related to continue with google]

Change-Id: I4d47da25ea8a6a231dce7e63051ffd7ea8fbc6ed
Signed-off-by: kamaljeet <kamal.jc@samsung.com>

diff --git a/src/oauth2_manager.c b/src/oauth2_manager.c
index b5ca2b5..6089ebb 100755 (executable)
--- a/src/oauth2_manager.c
+++ b/src/oauth2_manager.c
@@ -1084,16 +1084,31 @@ _on_auth_grant_received(oauth2_manager_s *mgr_handle, const char *response_url)
 static void
 on_web_url_load_error(void *data, Evas_Object *obj, void *event_info)
 {
+#if 1 /* bug patch */
+       const char *uri = ewk_error_url_get(event_info);
+#else
        const char *uri = event_info;
+#endif
 
        OAUTH2_LOG_I("on_web_url_load_error=[%s]", uri);
 
+#if 1
+       oauth2_manager_s *mgr_handle = data;
+       char *redirect_uri = NULL;
+       if(mgr_handle)
+               bundle_get_str(mgr_handle->request->request_data,OAUTH2_PARAMETER_KEY_REDIRECT_URI, &redirect_uri);
+       else
+               return;
+
+       if (g_str_has_prefix(uri, redirect_uri))
+               return;
+#endif
+
        /* wearable webkit does not have ewk_error defined */
 #ifndef WITHOUT_EWK_ERROR
-       oauth2_manager_s *mgr_handle = data;
        const Ewk_Error *error = (const Ewk_Error *)event_info;
 
-       if (mgr_handle && mgr_handle->is_webview_active == true
+       if (mgr_handle->is_webview_active == true
                && (ewk_error_code_get(error) != EWK_ERROR_CODE_CANCELED)) {
                __convert_tizen_error_to_oauth_error(OAUTH2_ERROR_NETWORK_ERROR,
                        "Network Error", &(mgr_handle->response));
@@ -1105,7 +1120,11 @@ on_web_url_load_error(void *data, Evas_Object *obj, void *event_info)
 static void
 on_web_url_load_finished(void *data, Evas_Object *obj, void *event_info)
 {
+#if 1
+       const char *uri = ewk_view_url_get(obj);
+#else
        const char *uri = event_info;
+#endif
 
        OAUTH2_LOG_I("on_web_url_load_finished=[%s]", uri);
 
@@ -1120,7 +1139,11 @@ on_web_url_load_finished(void *data, Evas_Object *obj, void *event_info)
 static void
 on_web_url_change(void *data, Evas_Object *obj, void *event_info)
 {
+#if 1
+       const char *uri = ewk_view_url_get(obj);
+#else
        const char *uri = event_info;
+#endif
 
        OAUTH2_LOG_I("on_web_url_change=[%s]", uri);