Fix network UI issue and fix P120829-5114,P120829-5115

Change-Id: I2cc28cdb60308312298808467ef3917a98dc394c

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index da74fdf..bae736c 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -474,15 +474,27 @@ bool is_string_belong_to_array(const char *partern, const char **array,
        return FALSE;
 }
 
+//NULL, "", "  ", "     " etc.. are all empty strings
 bool isEmptyStr(const char *str)
 {
-       if (NULL == str || str[0] == '\0') {
-               return TRUE;
-       } else {
-               return FALSE;
+       //if (NULL == str)
+       //      return TRUE;
+       while (str)
+       {
+               if (*str != '\0' && *str != ' ')
+               {
+                       return FALSE;
+               }
+               else if (*str == '\0')
+               {
+                       return TRUE;
+               }
+               str++;
        }
+       return TRUE;
 }
 
+
 int safeStrCmp(const char *s1, const char *s2)
 {
        /*  Check NULL value first */

diff --git a/setting-network/src/setting-network-main.c b/setting-network/src/setting-network-main.c
index 61c6cd8..0dfa24c 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -363,11 +363,11 @@ static int setting_network_main_create(void *cb)
                ad->sel_act = TAPI_NETWORK_SYSTEM_NO_SRV;
                vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &ad->sel_net);
                vconf_get_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, &ad->sel_act);
-               
+
                FREE(ad->sel_network);
                ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
                SETTING_TRACE("pa_sel_net_name:%s", ad->sel_network);
-               if (NULL == ad->sel_network) {
+               if (isEmptyStr(ad->sel_network)) {
                    ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
                }
                SETTING_TRACE("pa_net_name:%s", ad->sel_network);
@@ -377,12 +377,12 @@ static int setting_network_main_create(void *cb)
                char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
                if (TAPI_NETWORK_SELECTIONMODE_MANUAL == value) {
                        snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s. %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
+                                "%s, %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
                                 setting_network_get_act_str(ad->sel_act));
                }
                else{
                        snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s. %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
+                                "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
                }
 
                ad->data_sel_net = setting_create_Gendial_field_def(scroller,

diff --git a/setting-network/src/setting-network-select-network.c b/setting-network/src/setting-network-select-network.c
index 4ffd0dc..9c2d8bf 100755 (executable)
--- a/setting-network/src/setting-network-select-network.c
+++ b/setting-network/src/setting-network-select-network.c
@@ -63,14 +63,14 @@ static int setting_network_select_network_create(void *cb)
        elm_radio_state_value_set(ad->chk_sel, -1);
        vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &ad->sel_net);//retrieve here
        SETTING_TRACE("ad->sel_net:%d", ad->sel_net);
-       
+
        vconf_get_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, &ad->sel_act);//retrieve here
        SETTING_TRACE("ad->sel_act:%d", ad->sel_act);
 
        FREE(ad->sel_network);
        ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
        SETTING_TRACE("pa_sel_net_name:%s", ad->sel_network);
-       if (NULL == ad->sel_network) {
+       if (isEmptyStr(ad->sel_network)) {
            ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
        }
 
@@ -85,7 +85,7 @@ static int setting_network_select_network_create(void *cb)
                                            setting_network_select_network_chk_changed);
                setting_retvm_if(NULL == ad->data_auto_network_item,
                                 SETTING_RETURN_FAIL, "Failed to calloc memory");
-               ad->data_auto_network_item->sub_desc = (char *)g_strdup(ad->sel_network);
+               ad->data_auto_network_item->sub_desc = (char *)g_strdup(_(ad->sel_network));
                ad->data_auto_network_item->userdata = ad;
 
        } else if(TAPI_NETWORK_SELECTIONMODE_MANUAL == ad->sel_net) {
@@ -116,7 +116,7 @@ static int setting_network_select_network_create(void *cb)
                {
                        //normal case:
                        Setting_GenGroupItem_Data *item_Data = NULL;
-                       
+
                        char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
                        snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN, "%s (%s)",
                                 _(ad->sel_network),setting_network_get_act_str(ad->sel_act));
@@ -184,17 +184,17 @@ static int setting_network_select_network_destroy(void *cb)
        if (0 != vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &ad->sel_net)) {
                SETTING_TRACE_ERROR("vconf get failed");
        }
-       
+
        if (0 != vconf_get_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, &ad->sel_act)) {
                SETTING_TRACE_ERROR("vconf get failed");
        }
 
        FREE(ad->sel_network);
        ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
-       if (NULL == ad->sel_network) {
+       if (isEmptyStr(ad->sel_network)) {
            ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
        }
-       
+
        /*reset..*/
        ad->b_set_manul_network = FALSE;
        ad->b_set_auto_network = FALSE;

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index 1518342..e12f99f 100755 (executable)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -37,7 +37,7 @@ static void __selected_network_change_cb(keynode_t *key, void *data)
        char *value = vconf_keynode_get_str(key);
        char *vconf_name = vconf_keynode_get_name(key);
        if (!safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_NWNAME)) {
-               if (NULL == value) {
+               if (isEmptyStr(value)) {
                    value = "IDS_ST_BODY_NOSERVICE";
                }
                ad->sel_network = strdup(value);
@@ -45,7 +45,7 @@ static void __selected_network_change_cb(keynode_t *key, void *data)
                if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, ad->sel_net)) {
                        SETTING_TRACE_ERROR("vconf[%s] set failed");
                }
-               
+
                if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, ad->sel_act)) {
                        SETTING_TRACE_ERROR("vconf[%s] set failed");
                }
@@ -634,7 +634,7 @@ void setting_tapi_search_network_cb(TapiHandle *handle, int result, void *data,
                FREE(pa_net_name);
 
                SETTING_TRACE("Found %d valid networks in total[%d]", valid_cnt, cnt);
-               valid_cnt = 0;
+               //valid_cnt = 0; for test..
                if (valid_cnt > 0){
                        setting_create_popup_without_btn(ad, ad->win_get, NULL, _(keyStr_Searched), NULL, POPUP_INTERVAL, FALSE, FALSE);
                } else { //there is no invalid plmn nearby
@@ -659,15 +659,15 @@ void setting_tapi_get_serving_network_cb(TapiHandle *handle, int result, void *d
        ret_if(!user_data || !data);
        SettingNetworkUG *ad = user_data;
        TelNetworkServing_t *srv_nt = data;
-       
+
        if (result == TAPI_NETWORK_NO_ERR)
        {
                ad->sel_act = srv_nt->act;
                vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, ad->sel_act);
-               
+
                FREE(ad->sel_network);
                ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
-               if (NULL == ad->sel_network) {
+               if (isEmptyStr(ad->sel_network)) {
                    ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
                }
                setting_network_update_sel_network(ad);
@@ -677,7 +677,7 @@ void setting_tapi_get_serving_network_cb(TapiHandle *handle, int result, void *d
                //if failed, do nothing..
        }
        SETTING_TRACE_END;
-       
+
 }
 
 
@@ -1053,7 +1053,7 @@ void setting_network_update_sel_network(void *data)
        SETTING_TRACE("ad->sel_net:%d", ad->sel_net);
        SETTING_TRACE("ad->sel_network:%s", ad->sel_network);
        SETTING_TRACE("sel_act = [%s(%d)]", setting_network_get_act_str(ad->sel_act),ad->sel_act);
-       
+
        if (ad->data_auto_network_item) {
                if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == ad->sel_net)
                {
@@ -1072,19 +1072,19 @@ void setting_network_update_sel_network(void *data)
                char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
                if (TAPI_NETWORK_SELECTIONMODE_AUTOMATIC == ad->sel_net) {
                        snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s. %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
-               
+                                "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
+
                } else {
                        snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s. %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
+                                "%s, %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
                                 setting_network_get_act_str(ad->sel_act));
                }
-               
+
                SETTING_TRACE("sel_network_desc:%s", sel_network_desc);
-               
+
                G_FREE(ad->data_sel_net->sub_desc);
                ad->data_sel_net->sub_desc = (char *)g_strdup(_(sel_network_desc));
-               
+
                elm_object_item_data_set(ad->data_sel_net->item, ad->data_sel_net);
                elm_genlist_item_update(ad->data_sel_net->item);
        }