Fix bug N_SE-34398(Wrong PIN message not displayed)

Change-Id: Ia1d56074c31af3b67d4036699b4249adb267f970

diff --git a/debian/changelog b/debian/changelog
index 38b6dbf..2035f6c 100755 (executable)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ug-setting-wifidirect-efl (1.0.14) precise; urgency=low
+
+  * Fix bug N_SE-34398(Wrong PIN message not displayed)
+  * Git: rsa/apps/home/ug-wifi-direct
+  * Tag: libug-setting-wifidirect-efl_1.0.14
+
+ -- Gibyoung Kim <laskgb.kim@samsung.com>  Mon, 15 Apr 2013 16:37:10 +0900
+
 ug-setting-wifidirect-efl (1.0.13) precise; urgency=low
 
   * Fix bug N_SE-31317, N_SE-31886(Connect to another device)

diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec
index 2e97025..2dc6ca2 100755 (executable)
--- 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.13
+Version:    1.0.14
 Release:    1
 Group:      TO_BE_FILLED
 License:    Flora License

diff --git a/popup-wifidirect/include/wfd-app.h b/popup-wifidirect/include/wfd-app.h
index 8ed9346..6aa9338 100755 (executable)
--- a/popup-wifidirect/include/wfd-app.h
+++ b/popup-wifidirect/include/wfd-app.h
@@ -171,11 +171,4 @@ extern void wfd_destroy_popup();
  */
 extern void wfd_prepare_popup(int type, void *userdata);
 
-/**
- *     This function let the app create a tickernoti syspopup
- *     @return   void
- *     @param[in] msg the pointer to message of tickernoti
- */
-extern void wfd_tickernoti_popup(char *msg);
-
 #endif                          /* __WFD_SYS_POPAPP_MAIN_H__ */

diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c
index 283416d..d59b00c 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-client.c
+++ b/popup-wifidirect/src/wfd-app-client.c
@@ -28,10 +28,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <notification.h>
+#include <vconf.h>
+
 #include "wfd-app.h"
 #include "wfd-app-util.h"
 #include "wfd-app-strings.h"
-#include <vconf.h>
 
 /**
  *     This function let the app make a callback for connected peer
@@ -513,11 +516,11 @@ 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);
+                       notification_status_message_post(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"));
+                       notification_status_message_post(_("IDS_WFD_POP_PIN_INVALID"));
                } else {
                        if (error_code == WIFI_DIRECT_ERROR_CONNECTION_TIME_OUT) {
                                WDPOP_LOGD(
@@ -529,7 +532,7 @@ 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_CONNECT_FAILED, ad->peer_name);
-                       wfd_tickernoti_popup(msg);
+                       notification_status_message_post(msg);
                }
        }
        break;
@@ -623,7 +626,7 @@ 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_DISCONNECTED, ad->peer_name);
-               wfd_tickernoti_popup(msg);
+               notification_status_message_post(msg);
        }
        break;
 
@@ -637,14 +640,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_DISCONNECTED, ad->peer_name);
-               wfd_tickernoti_popup(msg);
+               notification_status_message_post(msg);
        }
        break;
        case WIFI_DIRECT_CONNECTION_IN_PROGRESS:
        {
                WDPOP_LOGD( "event ------------------ WIFI_DIRECT_CONNECTION_IN_PROGRESS\n");
                /* tickernoti popup */
-               wfd_tickernoti_popup(_("IDS_WFD_POP_CONNECTING"));
+               notification_status_message_post(_("IDS_WFD_POP_CONNECTING"));
        }
        break;
        case WIFI_DIRECT_INVITATION_REQ:
@@ -844,7 +847,6 @@ int deinit_wfd_popup_client(wfd_appdata_t *ad)
        }
 
        __WDPOP_LOG_FUNC_EXIT__;
-
        if (ret == WIFI_DIRECT_ERROR_NONE) {
                return TRUE;
        } else {

diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c
index c6459b8..14ec90b 100755 (executable)
--- a/popup-wifidirect/src/wfd-app-popup-view.c
+++ b/popup-wifidirect/src/wfd-app-popup-view.c
@@ -28,6 +28,8 @@
 #include <libintl.h>
 #include <glib.h>
 
+#include <notification.h>
+
 #include "wifi-direct.h"
 #include "wfd-app.h"
 #include "wfd-app-strings.h"
@@ -39,7 +41,6 @@ extern unsigned char g_wfd_peer_mac[6];
 extern unsigned char g_wfd_peer_name[32];
 static Ecore_Timer *pb_timer = NULL;
 
-void wfd_tickernoti_popup(char *msg);
 
 /**
  *     This function let the ug make a callback for click the button in popup
@@ -71,7 +72,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
                                result);
                if (result == WIFI_DIRECT_ERROR_NONE) {
                        /* tickernoti popup */
-                       wfd_tickernoti_popup(_("IDS_WFD_POP_CONNECTING"));
+                       notification_status_message_post(_("IDS_WFD_POP_CONNECTING"));
                } else {
                        WDPOP_LOGE(
                                        "wifi_direct_accept_connection() FAILED!!\n");
@@ -79,7 +80,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
 
                        /* tickernoti popup */
                        snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name);
-                       wfd_tickernoti_popup(msg);
+                       notification_status_message_post(msg);
                }
        }
        break;
@@ -95,7 +96,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
                                result);
                if (result == WIFI_DIRECT_ERROR_NONE) {
                        /* tickernoti popup */
-                       wfd_tickernoti_popup(_("IDS_WFD_POP_CONNECTING"));
+                       notification_status_message_post(_("IDS_WFD_POP_CONNECTING"));
                } else {
                        WDPOP_LOGE(
                                        "wifi_direct_connect() FAILED!!\n");
@@ -103,7 +104,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
 
                        /* tickernoti popup */
                        snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name);
-                       wfd_tickernoti_popup(msg);
+                       notification_status_message_post(msg);
                }
 
        break;
@@ -139,7 +140,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
                                "wifi_direct_accept_connection() failed. result=[%d]\n", result);
                        /* tickernoti popup */
                        snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name);
-                       wfd_tickernoti_popup(msg);
+                       notification_status_message_post(msg);
                }
        }
        break;
@@ -156,9 +157,9 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
 
                if (len != 8) {
                        if (len > 8)
-                               wfd_tickernoti_popup(_("IDS_CST_BODY_PASSWORD_TOO_LONG"));
+                               notification_status_message_post(_("IDS_CST_BODY_PASSWORD_TOO_LONG"));
                        else
-                               wfd_tickernoti_popup(_("IDS_ST_BODY_PASSWORD_TOO_SHORT"));
+                               notification_status_message_post(_("IDS_ST_BODY_PASSWORD_TOO_SHORT"));
                        wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL);
                        return;
                }
@@ -170,7 +171,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
                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);
+                       notification_status_message_post(msg);
                        return;
                }
 
@@ -186,7 +187,7 @@ static void __popup_resp_cb(void *data, Evas_Object * obj, void *event_info)
 
                        /* tickernoti popup */
                        snprintf(msg, WFD_POP_STR_MAX_LEN, IDS_WFD_POP_CONNECT_FAILED, ad->peer_name);
-                       wfd_tickernoti_popup(msg);
+                       notification_status_message_post(msg);
                }
        }
        break;
@@ -820,65 +821,4 @@ void wfd_prepare_popup(int type, void *userdata)
 
        __WDPOP_LOG_FUNC_EXIT__;
        return;
-}
-
-/**
- *     This function let the app create a tickernoti syspopup
- *     @return   void
- *     @param[in] msg the pointer to message of tickernoti
- */
-void wfd_tickernoti_popup(char *msg)
-{
-       __WDPOP_LOG_FUNC_ENTER__;
-
-       int ret = -1;
-       bundle *b = NULL;
-
-       b = bundle_create();
-       if (!b) {
-               WDPOP_LOGD( "FAIL: bundle_create()\n");
-               return;
-       }
-
-       /* tickernoti style */
-       ret = bundle_add(b, "0", "info");
-       if (ret) {
-               WDPOP_LOGD( "Fail to add tickernoti style\n");
-               bundle_free(b);
-               return;
-       }
-
-       /* popup text */
-       ret = bundle_add(b, "1", msg);
-       if (ret) {
-               WDPOP_LOGD( "Fail to add popup text\n");
-               bundle_free(b);
-               return;
-       }
-
-       /* orientation of tickernoti */
-       ret = bundle_add(b, "2", "0");
-       if (ret) {
-               WDPOP_LOGD( "Fail to add orientation of tickernoti\n");
-               bundle_free(b);
-               return;
-       }
-
-       /* timeout(second) of tickernoti */
-       ret = bundle_add(b, "3", "3");
-       if (ret) {
-               WDPOP_LOGD( "Fail to add timeout of tickernoti\n");
-               bundle_free(b);
-               return;
-       }
-
-       /* launch tickernoti */
-       ret = syspopup_launch(TICKERNOTI_SYSPOPUP, b);
-       if (ret) {
-               WDPOP_LOGD( "Fail to launch syspopup\n");
-       }
-
-       bundle_free(b);
-       __WDPOP_LOG_FUNC_EXIT__;
-}
-
+}
\ No newline at end of file