[UI] Changing the selected network when automatic selectection is used.

Change-Id: Ic9663c047cf05748444f055f1cedc4a8b8769e3b
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-network/include/setting-network-select-network.h b/setting-network/include/setting-network-select-network.h
index e2d4b0a6f3e119a2054da49bf896d77dc318145a..2aecfbc3b83c6d6246d3c545290e7181d1e72c80 100644 (file)
--- a/setting-network/include/setting-network-select-network.h
+++ b/setting-network/include/setting-network-select-network.h
@@ -26,7 +26,6 @@
 
 void select_network_app_control(SettingNetwork* ad);
 void select_network_terminate(void);
-void setting_network_update_sel_network(void *data);
 int select_network_show(SettingNetwork *ad);
 
 #endif

diff --git a/setting-network/include/setting-network.h b/setting-network/include/setting-network.h
index 1de65df8f495bbf89e8c3448de81045cf41a9975..b7688eb0a7831986d919a84886292d61d27e9f18 100644 (file)
--- a/setting-network/include/setting-network.h
+++ b/setting-network/include/setting-network.h
@@ -218,7 +218,6 @@ extern setting_view setting_network_connection_create_view;
 extern setting_view setting_view_network_profile_delete;
 extern setting_view setting_view_network_mode;
 
-void setting_network_update_sel_network(void *data);
 bool setting_network_equal_profile(connection_profile_h pf1,
                connection_profile_h pf2);
 void setting_network_reget_profile_list(void *cb);

diff --git a/setting-network/src/setting-network-select-network.c b/setting-network/src/setting-network-select-network.c
index f94de0da68815339b90a29a680ea2f7efffbd26e..29aaf6e916d9763c6cf75672385183f6600d3168 100644 (file)
--- a/setting-network/src/setting-network-select-network.c
+++ b/setting-network/src/setting-network-select-network.c
@@ -145,45 +145,6 @@ int select_network_show(SettingNetwork *ad)
        return setting_view_change(&setting_view_network_main, &setting_view_network_select_network, ad);
 }
 
-/**
- * [UI] update
- */
-void setting_network_update_sel_network(void *data)
-{
-       SETTING_TRACE_BEGIN;
-
-       if (s_info.data_auto_network_item) {
-               if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == s_info.sel_net) {
-                       char *sub_text = setting_customize_text(_(s_info.sel_network), 0, BLUE_COLOR, NULL);
-                       SETTING_TRACE("sub_text:%s", sub_text);
-                       elm_object_item_data_set(s_info.data_auto_network_item->item, s_info.data_auto_network_item);
-                       elm_genlist_item_update(s_info.data_auto_network_item->item);
-                       elm_genlist_item_fields_update(s_info.data_auto_network_item->item, "*", ELM_GENLIST_ITEM_FIELD_TEXT);
-                       FREE(sub_text);
-               } else {
-               }
-       }
-
-       if (s_info.data_sel_net) { /*it indicates TAPI is not responsed in time */
-               char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
-               if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == s_info.sel_net) {
-                       snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                       "%s, %s",
-                                       _("IDS_ST_BODY_ANSWERINGMODE_AUTOMATIC"),
-                                       _(s_info.sel_network));
-
-               } else {
-                       snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                       "%s, %s", _("IDS_ST_BODY_MANUAL"),
-                                       _(s_info.sel_network));
-               }
-
-               elm_object_item_data_set(s_info.data_sel_net->item, s_info.data_sel_net);
-               elm_genlist_item_update(s_info.data_sel_net->item);
-       }
-       SETTING_TRACE_END;
-}
-
 static void _tapi_get_serving_network_cb(TapiHandle *handle, int result, void *data, void *user_data)
 {
        SETTING_TRACE_BEGIN;
@@ -200,8 +161,6 @@ static void _tapi_get_serving_network_cb(TapiHandle *handle, int result, void *d
                s_info.sel_network = get_pa_select_network();
                if (!s_info.sel_network)
                        s_info.sel_network = strndup(Keystr_UNKNOWN_NETWORK, strlen(Keystr_UNKNOWN_NETWORK) + 1);
-
-               setting_network_update_sel_network(s_info.ad);
        } else {
                /*if failed, do nothing.. */
        }
@@ -394,6 +353,11 @@ static void _register_network_manual(Setting_GenGroupItem_Data *list_item)
 {
        SETTING_TRACE_BEGIN;
 
+       if (!list_item) {
+               SETTING_TRACE_ERROR("list_item == NULL");
+               return;
+       }
+
        s_info.sel_net = TAPI_NETWORK_SELECTIONMODE_MANUAL;
        s_info.b_set_manul_network = TRUE;
        s_info.b_set_manul_network = FALSE;
@@ -440,7 +404,6 @@ static void _cancel_network_search(void)
 static void _register_network(Setting_GenGroupItem_Data *list_item, bool is_auto)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(list_item == NULL);
 
        _cancel_network_search();
        _show_registering_popup();
@@ -681,26 +644,21 @@ static void _update_current_network_name(void)
        SETTING_TRACE_END;
 }
 
-static void _mark_selected_network_cb(TapiHandle *handle, int result, void *data, void *user_data)
+static void _tel_get_selected_network_cb(TapiHandle *handle, int result, void *data, void *user_data)
 {
        SETTING_TRACE_BEGIN;
-
+       TelNetworkServing_t *network = (TelNetworkServing_t*)data;
        int i = 0;
        int found_index = -1;
        TelNetworkIdentity_t *network_list = &s_info.plmn_info[s_info.sim_selected].network_list[0];
        int num = s_info.plmn_info[s_info.sim_selected].networks_count;
-       TelNetworkServing_t *network = (TelNetworkServing_t *)data;
        int len = strlen(network->plmn);
        if (!network) {
                SETTING_TRACE_ERROR("network == NULL");
                return;
        }
-
        for (i = 0; i < num; ++i) {
-               SETTING_TRACE("Current: (%s) <> List %s(%s)",
-                               network->plmn,
-                               network_list[i].network_name,
-                               network_list[i].plmn);
+               SETTING_TRACE("Current: (%s) <> List %s(%s)", network->plmn, network_list[i].network_name, network_list[i].plmn);
 
                if (strlen(network_list[i].plmn) == len && !strncmp(network->plmn, network_list[i].plmn, len)) {
                        found_index = i;
@@ -709,14 +667,11 @@ static void _mark_selected_network_cb(TapiHandle *handle, int result, void *data
        }
 
        elm_radio_value_set(s_info.chk_sel, TAPI_NETWORK_SELECTIONMODE_MANUAL + found_index + 1);
-
-       Elm_Object_Item *item = elm_genlist_nth_item_get(s_info.genlist_sel_network, TAPI_NETWORK_SELECTIONMODE_MANUAL + found_index + 1);
-       Setting_GenGroupItem_Data *item_data = elm_object_item_data_get(item);
+       Elm_Object_Item* item = elm_genlist_nth_item_get(s_info.genlist_sel_network, TAPI_NETWORK_SELECTIONMODE_MANUAL + found_index + 1);
+       Setting_GenGroupItem_Data* item_data = elm_object_item_data_get(item);
        int sel = elm_radio_value_get(item_data->rgd);
-                       SETTING_TRACE("rgd=%s, index=%d; sle=%d", evas_object_type_get(s_info.chk_sel), TAPI_NETWORK_SELECTIONMODE_MANUAL + found_index + 1, sel);
-
+       SETTING_TRACE("rgd=%s, index=%d; sle=%d", evas_object_type_get(s_info.chk_sel), TAPI_NETWORK_SELECTIONMODE_MANUAL + found_index + 1, sel);
        elm_genlist_realized_items_update(s_info.genlist_sel_network);
-
        SETTING_TRACE_END;
 }
 
@@ -785,7 +740,7 @@ static bool _fill_network_list(void)
        SETTING_TRACE("VCONFKEY_TELEPHONY_NWNAME:pa_net_name:%s", pa_net_name);
        FREE(pa_net_name);
 
-       tel_get_network_serving(s_info.ad->handle[s_info.sim_selected], _mark_selected_network_cb, NULL);
+       tel_get_network_serving(s_info.ad->handle[s_info.sim_selected], _tel_get_selected_network_cb, NULL);
 
        SETTING_TRACE_END;
        return (cnt > 0);
@@ -1167,8 +1122,6 @@ static int _view_destroy(void *cb)
 
        /*reset..*/
        s_info.b_set_manul_network = FALSE;
-       s_info.b_set_manul_network = FALSE;
-       setting_network_update_sel_network(s_info.ad);
 
        /*Following handlers will be used by async listening callback. They
         * must be reset after genlist is 'popuped'. */
@@ -1307,6 +1260,25 @@ static void _search_network_cancel_cb(void *data, Evas_Object *obj, void *event_
        SETTING_TRACE_END;
 }
 
+void _show_registered_popup(void)
+{
+       Evas_Object *popup = elm_popup_add(s_info.ad->md.window);
+       char r_str_text[128] = { 0 };
+
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       snprintf(r_str_text, 128, "<align=left>");
+       g_strlcat(r_str_text, _("IDS_ST_POP_REGISTERED"), 128);
+       g_strlcat(r_str_text, "</align>", 128);
+
+       elm_object_text_set(popup, r_str_text);
+       elm_popup_timeout_set(popup, 2.0);
+       evas_object_smart_callback_add(popup, "timeout", __back_to_previous_cb, NULL);
+       evas_object_show(popup);
+}
+
 /**
  * @see also __register_network
  */
@@ -1317,19 +1289,15 @@ static void _tapi_set_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
 
        _network_popup_delete();
 
-       if ((TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == s_info.sel_net
-                       && !s_info.b_set_manul_network)
-                       || (TAPI_NETWORK_SELECTIONMODE_MANUAL == s_info.sel_net
-                                       && !s_info.b_set_manul_network)) {
+       if ((TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == s_info.sel_net && !s_info.b_set_manul_network) ||
+                       (TAPI_NETWORK_SELECTIONMODE_MANUAL == s_info.sel_net && !s_info.b_set_manul_network)) {
                /*The requeset has already been canceled, return directly*/
                SETTING_TRACE("The requeset has already been canceled, return directly");
                return;
        }
 
        if (result != TAPI_NETWORK_NO_ERR) { /*roolback..*/
-               if (TAPI_NETWORK_SELECTIONMODE_MANUAL == s_info.sel_net
-                               && s_info.data_auto_network_item
-                               && !s_info.data_auto_network_item->chk_status) {
+               if (TAPI_NETWORK_SELECTIONMODE_MANUAL == s_info.sel_net && s_info.data_auto_network_item && !s_info.data_auto_network_item->chk_status) {
                        SETTING_TRACE("Need refreshing");
                        setting_create_popup(s_info.ad, s_info.ad->md.window, NULL, keyStr_Failed_Select_Network, NULL, 2 * POPUP_INTERVAL, FALSE, FALSE, 0);
                        elm_radio_value_set(s_info.chk_sel, -2);
@@ -1338,33 +1306,17 @@ static void _tapi_set_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
                return;
        }
 
-       if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT,
-                       s_info.sel_net)) {
+       if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, s_info.sel_net))
                SETTING_TRACE_ERROR("vconf[%s] set failed");
-       }
-       if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT,
-                       s_info.sel_act)) {
+
+       if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, s_info.sel_act))
                SETTING_TRACE_ERROR("vconf[%s] set failed");
-       }
 
        s_info.b_set_manul_network = FALSE;
-       s_info.b_set_manul_network = FALSE;
-       setting_network_update_sel_network(s_info.ad);
 
-       Evas_Object *popup = elm_popup_add(s_info.ad->md.window);
-       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK,
-                       eext_popup_back_cb, NULL);
-       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
-       EVAS_HINT_EXPAND);
-       char r_str_text[128] = { 0, };
-       snprintf(r_str_text, 128, "<align=left>");
-       g_strlcat(r_str_text, _("IDS_ST_POP_REGISTERED"), 128);
-       g_strlcat(r_str_text, "</align>", 128);
-       elm_object_text_set(popup, r_str_text);
-       elm_popup_timeout_set(popup, 2.0);
-       evas_object_smart_callback_add(popup, "timeout", __back_to_previous_cb, NULL);
-       evas_object_show(popup);
+       _show_registered_popup();
+
+       tel_get_network_serving(s_info.ad->handle[s_info.sim_selected], _tel_get_selected_network_cb, NULL);
 
        SETTING_TRACE_END;
 }
@@ -1457,7 +1409,6 @@ static void __selected_network_change_cb(keynode_t *key, void *data)
                if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, s_info.sel_act))
                        SETTING_TRACE_ERROR("vconf[%s] set failed");
 
-               setting_network_update_sel_network(ad);
        } else if (!safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_FLIGHT_MODE)) {
                SETTING_TRACE("vconf_name:%s", vconf_name);
                setting_create_popup(ad, ad->md.naviframe, NULL,
@@ -1496,7 +1447,6 @@ static void _tapi_get_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
                if (s_info.sel_net != sel) {
                        s_info.sel_net = sel;
                        vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, s_info.sel_net);
-                       setting_network_update_sel_network(s_info.ad);
                }
        } else {
        }

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 759c901b3b324374d98ed5e64ae073841b907503..e481b2bed4770c905044bfc5a2312ee904056f1d 100644 (file)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -373,7 +373,6 @@ static void _lang_changed(app_event_info_h event_info, void *priv)
 
 #ifdef UI_NETWORK_MODE
        setting_network_mode_app_control(ad);
-       setting_network_update_sel_network(ad);
 #endif
        /*update title */
        Elm_Object_Item *navi_it = elm_naviframe_bottom_item_get(ad->md.naviframe);