From 1bc73905b987c28b2231ae5b2ae536ef88b43bbe Mon Sep 17 00:00:00 2001 From: Kim Gibyoung Date: Fri, 1 Feb 2013 03:14:36 +0900 Subject: [PATCH] Fix bug(N_SE-23716) Change-Id: Iccf6c7581208193deea510ad4402ff0e3b8f298d --- debian/changelog | 8 +++++ packaging/libug-setting-wifidirect-efl.spec | 2 +- popup-wifidirect/src/wfd-app-client.c | 7 ++-- popup-wifidirect/src/wfd-app-popup-view.c | 56 +++++++++++------------------ 4 files changed, 33 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3d0a2d..6d4d91f 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ug-setting-wifidirect-efl (1.0.6) precise; urgency=low + + * Fix bug(N_SE-23716) + * Git: rsa/apps/home/ug-wifi-direct + * Tag: libug-setting-wifidirect-efl_1.0.6 + + -- Gibyoung Kim Fri, 1 Feb 2013 03:04:18 +0900 + ug-setting-wifidirect-efl (1.0.5) precise; urgency=low * Package update diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec index 081b841..4aaaf9c 100755 --- a/packaging/libug-setting-wifidirect-efl.spec +++ b/packaging/libug-setting-wifidirect-efl.spec @@ -3,7 +3,7 @@ Name: libug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.0.5 +Version: 1.0.6 Release: 1 Group: TO_BE_FILLED License: Flora License diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c index 247da0e..5a103c3 100755 --- a/popup-wifidirect/src/wfd-app-client.c +++ b/popup-wifidirect/src/wfd-app-client.c @@ -513,13 +513,14 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st /* tickernoti popup */ snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECTED, ad->peer_name); wfd_tickernoti_popup(msg); + } else if (error_code == WIFI_DIRECT_ERROR_AUTH_FAILED) { + WDPOP_LOGD( + "Error Code - WIFI_DIRECT_ERROR_AUTH_FAILED\n"); + wfd_tickernoti_popup(_("IDS_WFD_POP_PIN_INVALID")); } else { if (error_code == WIFI_DIRECT_ERROR_CONNECTION_TIME_OUT) { WDPOP_LOGD( "Error Code - WIFI_DIRECT_ERROR_CONNECTION_TIME_OUT\n"); - } else if (error_code == WIFI_DIRECT_ERROR_AUTH_FAILED) { - WDPOP_LOGD( - "Error Code - WIFI_DIRECT_ERROR_AUTH_FAILED\n"); } else if (error_code == WIFI_DIRECT_ERROR_CONNECTION_FAILED) { WDPOP_LOGD( "Error Code - WIFI_DIRECT_ERROR_CONNECTION_FAILED\n"); diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c index d231ecc..3f16762 100755 --- a/popup-wifidirect/src/wfd-app-popup-view.c +++ b/popup-wifidirect/src/wfd-app-popup-view.c @@ -129,46 +129,30 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info) int len = strlen(ad->pin_number); WDPOP_LOGD( "button ok: pin [%s]", ad->pin_number); - if (len > 7 && len < 64) { - int result = 0; - WDPOP_LOGD( "pin=[%s]\n", ad->pin_number); - - result = wifi_direct_set_wps_pin(ad->pin_number); - if (result != WIFI_DIRECT_ERROR_NONE) { - /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); - wfd_tickernoti_popup(msg); - return; - } - - //result = wifi_direct_activate_pushbutton(); - result = wifi_direct_accept_connection(ad->peer_mac); - WDPOP_LOGD( - "wifi_direct_accept_connection(%s) result=[%d]\n", - ad->peer_mac, result); - if (result != WIFI_DIRECT_ERROR_NONE) { - WDPOP_LOGE( - "wifi_direct_accept_connection() FAILED!!\n"); - evas_object_hide(ad->win); - - /* tickernoti popup */ - snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); - wfd_tickernoti_popup(msg); - } - } else { - WDPOP_LOGE( "Error, Incorrect PIN!!\n"); + int result = 0; + WDPOP_LOGD( "pin=[%s]\n", ad->pin_number); + result = wifi_direct_set_wps_pin(ad->pin_number); + if (result != WIFI_DIRECT_ERROR_NONE) { /* tickernoti popup */ - wfd_tickernoti_popup(_("IDS_WFD_POP_PIN_INVALID")); + snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); + wfd_tickernoti_popup(msg); + return; + } - /* redraw the popup */ - if (WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK == resp) { - wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL); - } else { - wfd_prepare_popup(WFD_POP_APRV_CONNECTION_WPS_KEYPAD_REQ, (void *) NULL); - } + //result = wifi_direct_activate_pushbutton(); + result = wifi_direct_accept_connection(ad->peer_mac); + WDPOP_LOGD( + "wifi_direct_accept_connection(%s) result=[%d]\n", + ad->peer_mac, result); + if (result != WIFI_DIRECT_ERROR_NONE) { + WDPOP_LOGE( + "wifi_direct_accept_connection() FAILED!!\n"); + evas_object_hide(ad->win); - return; + /* tickernoti popup */ + snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name); + wfd_tickernoti_popup(msg); } } break; -- 2.7.4