Disabled web progress popup

[Fix for OAuth2 TBT issue]

Change-Id: I94b5b7fab56faaf10e28b754526d321b38a6b7c7
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/src/oauth2_manager.c b/src/oauth2_manager.c
index e4eb13d1b9fc5647123a429f89507aeeaab15853..f8075a131ed482ffb56af12dd51e0462c7921f55 100644 (file)
--- a/src/oauth2_manager.c
+++ b/src/oauth2_manager.c
@@ -146,10 +146,10 @@ __hide_web_view(oauth2_manager_s *mgr_handle)
                evas_object_hide(mgr_handle->login_win);
        }
 
-       if (mgr_handle->loading_popup) {
+       /*if (mgr_handle->loading_popup) {
                evas_object_hide(mgr_handle->loading_popup);
                mgr_handle->loading_popup = NULL;
-       }
+       }*/
 }
 
 static void
@@ -1022,6 +1022,10 @@ _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)
 {
+       const char *uri = event_info;
+
+       OAUTH2_LOG_I("on_web_url_load_error=[%s]", uri);
+
        /* wearable webkit does not have ewk_error defined */
 #ifndef WITHOUT_EWK_ERROR
        oauth2_manager_s *mgr_handle = data;
@@ -1039,12 +1043,16 @@ 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)
 {
-       oauth2_manager_s *mgr_handle = data;
+       const char *uri = event_info;
+
+       OAUTH2_LOG_I("on_web_url_load_finished=[%s]", uri);
+
+       /*oauth2_manager_s *mgr_handle = data;
 
        if (mgr_handle->loading_popup) {
                evas_object_hide(mgr_handle->loading_popup);
                mgr_handle->loading_popup = NULL;
-       }
+       }*/
 }
 
 static void
@@ -1052,19 +1060,21 @@ on_web_url_change(void *data, Evas_Object *obj, void *event_info)
 {
        const char *uri = event_info;
 
+       OAUTH2_LOG_I("on_web_url_change=[%s]", uri);
+
        oauth2_manager_s *mgr_handle = data;
        char *redirect_uri = NULL;
        bundle_get_str(mgr_handle->request->request_data,
                OAUTH2_PARAMETER_KEY_REDIRECT_URI, &redirect_uri);
 
        if (!g_str_has_prefix(uri, redirect_uri)) {
-               if (mgr_handle->loading_popup == NULL) {
+               /*if (mgr_handle->loading_popup == NULL) {
                        mgr_handle->loading_popup = elm_popup_add(mgr_handle->login_win);
                        elm_popup_content_text_wrap_type_set(mgr_handle->loading_popup, ELM_WRAP_MIXED);
                        elm_object_text_set(mgr_handle->loading_popup, OAUTH2_LOADING_POP_UP_TEXT);
                        elm_popup_orient_set(mgr_handle->loading_popup, ELM_POPUP_ORIENT_BOTTOM);
                        evas_object_show(mgr_handle->loading_popup);
-               }
+               }*/
                return;
        }
 
@@ -1090,10 +1100,10 @@ __start_auth_grant_request(oauth2_manager_s *mgr_handle)
        eext_object_event_callback_add(mgr_handle->login_win,
                EEXT_CALLBACK_BACK, __exit_back_cb, mgr_handle);
 
-       mgr_handle->loading_popup = elm_popup_add(mgr_handle->login_win);
+       /*mgr_handle->loading_popup = elm_popup_add(mgr_handle->login_win);
        elm_popup_content_text_wrap_type_set(mgr_handle->loading_popup, ELM_WRAP_MIXED);
        elm_object_text_set(mgr_handle->loading_popup, OAUTH2_LOADING_POP_UP_TEXT);
-       elm_popup_orient_set(mgr_handle->loading_popup, ELM_POPUP_ORIENT_BOTTOM);
+       elm_popup_orient_set(mgr_handle->loading_popup, ELM_POPUP_ORIENT_BOTTOM);*/
 
        ewk_init();
 
@@ -1122,17 +1132,18 @@ __start_auth_grant_request(oauth2_manager_s *mgr_handle)
                EEXT_CALLBACK_BACK, __handle_back_key, mgr_handle);
 
        ewk_view_url_set(mgr_handle->ewk_view, authorization_url);
-       evas_object_size_hint_min_set(mgr_handle->ewk_view, 480, 800);
 
-       /*Ecore_X_Screen *screen = ecore_x_default_screen_get();
-       if (screen != NULL) {
-               int w = 0;
-               int h = 0;
-               ecore_x_screen_size_get (screen, &w, &h);
-               LOGI("Screen info = [%d][%d]", w, h);
+       static int s_w = 0;
+       static int s_h = 0;
+
+       system_info_get_platform_int("http://tizen.org/feature/screen.width", &s_w);
+       system_info_get_platform_int("http://tizen.org/feature/screen.height", &s_h);
+
+       if ((s_w > 0) && (s_h > 0))
+               evas_object_size_hint_min_set(mgr_handle->ewk_view, s_w, s_h);
+       else
+               evas_object_size_hint_min_set(mgr_handle->ewk_view, 480, 800);
 
-               evas_object_size_hint_min_set(mgr_handle->ewk_view, w, h);
-       }*/
 
        evas_object_size_hint_weight_set(mgr_handle->ewk_view,
                EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1151,7 +1162,7 @@ __start_auth_grant_request(oauth2_manager_s *mgr_handle)
 
        evas_object_show(mgr_handle->login_win);
 
-       evas_object_show(mgr_handle->loading_popup);
+       /*evas_object_show(mgr_handle->loading_popup);*/
 
        return OAUTH2_ERROR_NONE;
 }

diff --git a/src/oauth2_private.h b/src/oauth2_private.h
index a2fb75f57a632e50bc375e8e253aa31b449a4185..0f6175e8c9c2fc55c2305d3fb9c299713ef91062 100644 (file)
--- a/src/oauth2_private.h
+++ b/src/oauth2_private.h
@@ -115,7 +115,7 @@ typedef struct _oauth2_manager_s {
        Evas_Object *login_win;
        Evas_Object *content_box;
        Evas_Object *ewk_view;
-       Evas_Object *loading_popup;
+       /*Evas_Object *loading_popup;*/
        CURL *curl_handle;
        JsonParser *parser_handle;
        oauth2_response_s *response;