[TSAM-10467] wearable: Launch toast popup when connected with AP

Change-Id: I0305e1b8ee6540e9d2876d5a1432209445215fc5
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 8c75a7a..89a17c7 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.216
+Version:       1.0.217
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c
index 2bb83de..503fdd8 100755 (executable)
--- a/sources/wearable/src/wearable-circle/app_main.c
+++ b/sources/wearable/src/wearable-circle/app_main.c
@@ -118,6 +118,8 @@ static layout_scan_object *_scan_create(view_base_object *base_obj, app_object *
 static void _popup_scanning_show(app_object *app_obj, gboolean is_scanning_for_wifi_activate);
 static void __popup_scanning_destroy_cb(void *data, Evas_Object *obj, void *event_info);
 
+static void _toast_popup_show(app_object *app_obj, const gchar *text);
+
 static void                _main_callbacks_init(layout_main_object *main_obj, app_object *app_obj);
 static layout_main_object *_main_create(view_base_object *base_obj, app_object *app_obj);
 
@@ -457,6 +459,7 @@ static void __wifi_manager_connection_state_changed_cb(wifi_manager_object *mana
                                                       wifi_rssi_level_e rssi_level, gpointer user_data)
 {
        app_object *app_obj = user_data;
+       char buf[MAX_POPUP_TEXT_LENGTH] = "";
        gchar *ssid;
 
        __WIFI_FUNC_ENTER__;
@@ -465,22 +468,24 @@ static void __wifi_manager_connection_state_changed_cb(wifi_manager_object *mana
        ssid = wifi_manager_ap_get_ssid(ap);
        WIFI_LOG_INFO("[%s] connection state = %s", ssid,
                      wifi_connection_state_to_string(connection_state));
-       g_free(ssid);
 
-       // Main screen: Main menu update
+       /* Main screen: Main menu update */
        if (app_obj->main) {
                layout_main_menu_update(app_obj->main, MAIN_MENU_SCAN);
        }
 
-       // Scan screen: AP list update, show
+       /* Scan screen: AP list update, show */
        if (app_obj->scan) {
                Elm_Object_Item *ap_item = layout_scan_ap_list_find_item_by_data(
                        app_obj->scan, ap, _compare_wifi_ap_object);
-               if (ap_item) {
+               if (ap_item)
                        wifi_manager_ap_refresh(elm_object_item_data_get(ap_item));
-               }
+
                switch (connection_state) {
                case WIFI_CONNECTION_STATE_CONNECTED:
+                       g_snprintf(buf, MAX_POPUP_TEXT_LENGTH, STR_CONNECTED_TO_WIFI_NETWORK, ssid);
+                       _toast_popup_show(app_obj, buf);
+
                        layout_scan_pop_to(app_obj->scan);
                        layout_scan_ap_list_item_move_to_top(app_obj->scan, ap_item);
                        //elm_genlist_item_update(ap_item);
@@ -500,13 +505,16 @@ static void __wifi_manager_connection_state_changed_cb(wifi_manager_object *mana
 
                case WIFI_CONNECTION_STATE_FAILURE:
                case WIFI_CONNECTION_STATE_DISCONNECTED:
-                       // for auto connect to favorite ap
+                       /* for auto connect to favorite ap */
                        _wifi_manager_scan_start(app_obj);
                        elm_genlist_item_update(ap_item);
                        _release_popups(app_obj);
                        break;
                }
        }
+
+       if (ssid)
+               g_free(ssid);
 }
 
 static void __wifi_manager_wifi_use_changed_cb(keynode_t *node, void *user_data)
@@ -1251,8 +1259,6 @@ static void __wifi_manager_connected_cb(wifi_manager_object *manager,
                }
        } else {
                WIFI_LOG_INFO("Wi-Fi connection Success");
-               g_snprintf(buf, MAX_POPUP_TEXT_LENGTH, STR_CONNECTED_TO_WIFI_NETWORK, wifi_manager_ap_get_ssid(ap));
-               _toast_popup_show(app_obj, buf);
        }
 
        if (app_obj->scan) {