about: Added vlues update callbacks; Depreciated code removed

Added vconf callbacks for values of storage and Bluetooth updates.
Refactored depreciated code of WiFi with current one. Fixed some code
issues.

Change-Id: I9c4403b11af1bdf8f24de73380a022f5264f2759
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>

diff --git a/packaging/org.tizen.setting-profile_mobile.spec b/packaging/org.tizen.setting-profile_mobile.spec
index d2bbe7004e12294bd440ad9ec1e5487432ef3f6b..d28690bd8eccb88fbd781efcdc8bd82e846d4a5f 100755 (executable)
--- a/packaging/org.tizen.setting-profile_mobile.spec
+++ b/packaging/org.tizen.setting-profile_mobile.spec
@@ -11,82 +11,80 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    packaging/firewall.service
 
-BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires: pkgconfig(app2sd)
+BuildRequires: pkgconfig(capi-media-image-util)
+BuildRequires:  pkgconfig(accounts-svc)
+BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(appcore-common)
 BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(bluetooth-api)
-BuildRequires:  pkgconfig(mm-sound)
-BuildRequires:  pkgconfig(mm-keysound)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(ui-gadget-1)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(ecore-input)
-BuildRequires:  pkgconfig(eina)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gthread-2.0)
-BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(ecore-imf)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-file)
-BuildRequires:  pkgconfig(chromium-efl)
-BuildRequires:  pkgconfig(accounts-svc)
-BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(edje)
-BuildRequires:  pkgconfig(mm-player)
-BuildRequires:  pkgconfig(capi-network-connection)
-BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(appsvc)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(notification)
-BuildRequires:  pkgconfig(capi-system-runtime-info)
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  pkgconfig(auth-fw)
+BuildRequires:  pkgconfig(badge)
+BuildRequires:  pkgconfig(bluetooth-api)
+BuildRequires:  pkgconfig(bundle)
+BuildRequires:  pkgconfig(callmgr_client)
+BuildRequires:  pkgconfig(capi-appfw-app-common)
+BuildRequires:  pkgconfig(capi-appfw-app-manager)
+BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(capi-appfw-package-manager)
+BuildRequires:  pkgconfig(capi-appfw-preference)
+BuildRequires:  pkgconfig(capi-base-utils-i18n)
+BuildRequires:  pkgconfig(capi-content-media-content)
+BuildRequires:  pkgconfig(capi-media-metadata-extractor)
 BuildRequires:  pkgconfig(capi-media-player)
 BuildRequires:  pkgconfig(capi-media-sound-manager)
-BuildRequires:  pkgconfig(capi-content-media-content)
+BuildRequires:  pkgconfig(capi-network-bluetooth)
+BuildRequires:  pkgconfig(capi-network-connection)
+BuildRequires:  pkgconfig(capi-network-wifi)
+BuildRequires:  pkgconfig(capi-network-wifi-manager)
 BuildRequires:  pkgconfig(capi-system-device)
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-appfw-app-manager)
-BuildRequires:  pkgconfig(capi-appfw-preference)
-BuildRequires:  pkgconfig(capi-system-sensor)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-system-runtime-info)
+BuildRequires:  pkgconfig(capi-system-sensor)
 BuildRequires:  pkgconfig(capi-system-system-settings)
-BuildRequires:  pkgconfig(capi-network-wifi)
-BuildRequires:  pkgconfig(capi-network-bluetooth)
-BuildRequires:  pkgconfig(capi-media-metadata-extractor)
-BuildRequires:  pkgconfig(capi-appfw-app-common)
-BuildRequires:  pkgconfig(shortcut)
-BuildRequires:  pkgconfig(ecore-evas)
-BuildRequires:  pkgconfig(pkgmgr)
-BuildRequires:  pkgconfig(storage)
-BuildRequires:  pkgconfig(pkgmgr-info)
-BuildRequires:  pkgconfig(iniparser)
-BuildRequires:  pkgconfig(tts)
-BuildRequires:  pkgconfig(tts-setting)
-BuildRequires:  pkgconfig(alarm-service)
+BuildRequires:  pkgconfig(capi-telephony)
+BuildRequires:  pkgconfig(chromium-efl)
 BuildRequires:  pkgconfig(contacts-service2)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(deviced)
-BuildRequires:  pkgconfig(badge)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(dpm)
+BuildRequires:  pkgconfig(ecore)
+BuildRequires:  pkgconfig(ecore-evas)
+BuildRequires:  pkgconfig(ecore-file)
+BuildRequires:  pkgconfig(ecore-imf)
+BuildRequires:  pkgconfig(ecore-input)
+BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(notification)
-BuildRequires: pkgconfig(app2sd)
-BuildRequires: pkgconfig(capi-media-image-util)
-BuildRequires:  pkgconfig(capi-appfw-package-manager)
-BuildRequires:  pkgconfig(capi-telephony)
-BuildRequires:  pkgconfig(bundle)
+BuildRequires:  pkgconfig(eina)
+BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(evas)
+BuildRequires:  pkgconfig(feedback)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(iniparser)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(mm-keysound)
+BuildRequires:  pkgconfig(mm-player)
+BuildRequires:  pkgconfig(mm-sound)
 BuildRequires:  pkgconfig(notification)
-BuildRequires:  pkgconfig(callmgr_client)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(privilege-info)
 BuildRequires:  pkgconfig(security-privilege-manager)
-BuildRequires:  pkgconfig(auth-fw)
-BuildRequires:  pkgconfig(dpm)
-BuildRequires:  pkgconfig(capi-base-utils-i18n)
+BuildRequires:  pkgconfig(shortcut)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(storage)
+BuildRequires:  pkgconfig(tapi)
+BuildRequires:  pkgconfig(tts)
+BuildRequires:  pkgconfig(tts-setting)
+BuildRequires:  pkgconfig(ui-gadget-1)
+BuildRequires:  pkgconfig(vconf)
 BuildRequires:  libcap-devel
 BuildRequires:  cmake
 BuildRequires:  edje-tools

diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt
index f99387eafab9469a6318a788d73a3f8fa984d4ef..6c0fc7b7206066f25305f88fd295484eaebd913b 100644 (file)
--- a/setting-about/CMakeLists.txt
+++ b/setting-about/CMakeLists.txt
@@ -13,6 +13,7 @@ pkg_check_modules(pkgs_about REQUIRED
        capi-appfw-application
        capi-network-bluetooth
        capi-network-wifi
+       capi-network-wifi-manager
        capi-system-device
        capi-system-info
        capi-system-runtime-info

diff --git a/setting-about/include/setting-about.h b/setting-about/include/setting-about.h
index a9c54f3c2ea233f307352c7fd7a7b2d299a63cc0..5694df133b5c54db42a1e93a6011b049154aa3de 100644 (file)
--- a/setting-about/include/setting-about.h
+++ b/setting-about/include/setting-about.h
@@ -77,11 +77,12 @@ struct _SettingAbout {
        Setting_GenGroupItem_Data *item_dev_name;
        Setting_GenGroupItem_Data *item_dev_name_main;
 
-       Setting_GenGroupItem_Data *item_data_cpu;
-       Setting_GenGroupItem_Data *item_data_battery;
+       Setting_GenGroupItem_Data *item_data_my_phone_number;
        Setting_GenGroupItem_Data *item_data_bt;
        Setting_GenGroupItem_Data *item_data_wifi;
-       Setting_GenGroupItem_Data *item_data_my_phone_number;
+       Setting_GenGroupItem_Data *item_data_storage;
+       Setting_GenGroupItem_Data *item_data_battery;
+       Setting_GenGroupItem_Data *item_data_cpu;
 
        Evas_Object *popup;
        Evas_Object *popup_space;

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index d5d7191c5d0b9664043c23994e1d68f4dc767b84..77af796ce07d3ee9306e94a861f563037e267862 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -790,35 +790,9 @@ static void __setting_about_main_vconf_change_cb(keynode_t *key, void *data)
        setting_retm_if(NULL == key, "key is NULL");
        setting_retm_if(NULL == data, "data is NULL");
        SettingAbout *ad = (SettingAbout *)data;
-
-       int status = vconf_keynode_get_int(key);
        char *vconf_name = vconf_keynode_get_name(key);
 
-       if (!safeStrCmp(vconf_name, VCONFKEY_WIFI_STATE)) {
-               SETTING_TRACE("status:%d", status);
-               char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
-               //setting_about_main_get_wifi_mac_address_string(str,
-                               //sizeof(str));
-               if (ad->item_data_wifi) {
-                       G_FREE(ad->item_data_wifi->sub_desc);
-                       ad->item_data_wifi->sub_desc = (char *)g_strdup(str);
-                       elm_object_item_data_set(ad->item_data_wifi->item,
-                                       ad->item_data_wifi);
-                       elm_genlist_item_update(ad->item_data_wifi->item);
-               }
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_BT_STATUS)) {
-               SETTING_TRACE("status:%d", status);
-               char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
-               //setting_about_main_get_bluetooth_address_string(str,
-               //              sizeof(str));
-               if (ad->item_data_bt) {
-                       G_FREE(ad->item_data_bt->sub_desc);
-                       ad->item_data_bt->sub_desc = (char *)g_strdup(str);
-                       elm_object_item_data_set(ad->item_data_bt->item,
-                                       ad->item_data_bt);
-                       elm_genlist_item_update(ad->item_data_bt->item);
-               }
-       } else if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_DEVICE_NAME_STR)) {
+       if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_DEVICE_NAME_STR)) {
                char *name_value = NULL;
                name_value = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
                if (NULL == name_value) {
@@ -1548,6 +1522,7 @@ static int __setting_about_main_generate_genlist(void *data)
 static int _view_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
+       int ret;
        Evas_Object *back_button = NULL;
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        SettingAbout *ad = (SettingAbout *)cb;
@@ -1568,16 +1543,6 @@ static int _view_create(void *cb)
 
        __setting_about_main_generate_genlist(ad);
 
-       int ret = vconf_notify_key_changed(VCONFKEY_WIFI_STATE,
-                       __setting_about_main_vconf_change_cb, ad);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("call vconf_notify_key_changed failed");
-
-       ret = vconf_notify_key_changed(VCONFKEY_BT_STATUS,
-                       __setting_about_main_vconf_change_cb, ad);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("call vconf_notify_key_changed failed");
-
        ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
                        __setting_about_main_vconf_change_cb, ad);
        if (ret != 0)
@@ -1597,21 +1562,12 @@ static int _view_create(void *cb)
 static int _view_destroy(void *cb)
 {
        SETTING_TRACE_BEGIN;
+       int ret;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
        SettingAbout *ad = (SettingAbout *)cb;
 
-       int ret = vconf_ignore_key_changed(VCONFKEY_WIFI_STATE,
-                       __setting_about_main_vconf_change_cb);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("call vconf_ignore_key_changed failed");
-
-       ret = vconf_ignore_key_changed(VCONFKEY_BT_STATUS,
-                       __setting_about_main_vconf_change_cb);
-       if (ret != 0)
-               SETTING_TRACE_ERROR("call vconf_ignore_key_changed failed");
-
        ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
                        __setting_about_main_vconf_change_cb);
        if (ret != 0)

diff --git a/setting-about/src/setting-about-status.c b/setting-about/src/setting-about-status.c
index a292bda18e4e9309c1bf6a2a3c60db26bb7c85af..a5e90fde38321e4009365428a54fb5bc7dd24941 100644 (file)
--- a/setting-about/src/setting-about-status.c
+++ b/setting-about/src/setting-about-status.c
@@ -25,6 +25,7 @@
 #include <telephony.h>
 #include <bluetooth.h>
 #include <wifi.h>
+#include <wifi-manager.h>
 
 #include "setting-about.h"
 #include "setting-about-main.h"
@@ -34,20 +35,20 @@ static int _view_destroy(void *cb);
 
 static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
 static Eina_Bool __setting_about_status_timer_update_cb(void *data);
-
-static int __setting_about_status_generate_genlist(void *data);
-static void __setting_about_status_get_phone_number(
+static void __vconf_change_cb(keynode_t *key, void *data);
+static int __generate_genlist(void *data);
+static void __get_phone_number(
                        telephony_handle_list_s *list, char *str, int size);
-static int __setting_about_status_get_imei(
+static int __get_imei(
                        telephony_handle_list_s *list, char *str, int size);
-static void __setting_about_status_get_bluetooth_address(char *str, int size);
-static void __setting_about_status_get_wifi_mac_address(char *str, int size);
-static void __setting_about_status_get_serial_number(char *str, int size);
-static void __setting_about_status_get_storage_capacity(char *str, int size);
-static void __setting_about_status_get_battery_percent(char *str, int size);
-static int __setting_about_status_stat_get_cpuinfo(float *usr_pct, float *sys_pct);
-static void __setting_about_status_get_device_status(char *str, int size);
-static void __setting_about_status_get_security_status(char *str, int size);
+static void __get_bluetooth_address(char *str, int size);
+static void __get_wifi_mac_address(char *str, int size);
+static void __get_serial_number(char *str, int size);
+static void __get_storage_capacity(char *str, int size);
+static void __get_battery_percent(char *str, int size);
+static int __stat_get_cpuinfo(float *usr_pct, float *sys_pct);
+static void __get_device_status(char *str, int size);
+static void __get_security_status(char *str, int size);
 
 setting_view view_setting_about_status = {
        .create = _view_create,
@@ -59,24 +60,37 @@ setting_view view_setting_about_status = {
 static int _view_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
-
        /* variables initialization */
+       int ret;
        SettingAbout *ad = (SettingAbout *)cb;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
+       /* create genlist and push to naviframe */
        setting_create_genlist_and_push_to_naviframe(
                        _("IDS_ST_MBODY_DEVICE_STATUS"), NULL,
                        _naviframe_item_pop_cb, ad, &ad->status_gl,
                        ad->md.naviframe);
 
-       /* telephony_handle_list_s initialization*/
+       /* telephony_handle_list_s initialization */
        if (telephony_init(&ad->tel_h_list) != TELEPHONY_ERROR_NONE) {
                SETTING_TRACE_ERROR("telephony_init failed");
                ad->tel_h_list.count = 0;
        }
-       __setting_about_status_generate_genlist(ad);
+
+       /* fill genlist */
+       __generate_genlist(ad);
+
+       /* values update callbacks */
        ad->update_timer = ecore_timer_add(1,
                        __setting_about_status_timer_update_cb, ad);
+       ret = vconf_notify_key_changed(VCONFKEY_BT_STATUS,
+                       __vconf_change_cb, ad);
+       if (ret != 0)
+               SETTING_TRACE_ERROR("BT vconf_notify_key_changed failed");
+       ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                       __vconf_change_cb, ad);
+       if (ret != 0)
+               SETTING_TRACE_ERROR("MMC vconf_notify_key_changed failed");
 
        view_setting_about_status.is_create = 1;
        return SETTING_RETURN_SUCCESS;
@@ -85,6 +99,7 @@ static int _view_create(void *cb)
 static int _view_destroy(void *cb)
 {
        SETTING_TRACE_BEGIN;
+       int ret;
        SettingAbout *ad = (SettingAbout *)cb;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
@@ -94,8 +109,14 @@ static int _view_destroy(void *cb)
        ecore_timer_del(ad->update_timer);
        ad->update_timer = NULL;
 
-       if (!view_setting_about_status.is_create)
-               return SETTING_RETURN_SUCCESS;
+       ret = vconf_ignore_key_changed(VCONFKEY_BT_STATUS,
+                       __vconf_change_cb);
+       if (ret != 0)
+               SETTING_TRACE_ERROR("BT vconf_ignore_key_changed failed");
+       ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_MMC_STATUS,
+                       __vconf_change_cb);
+       if (ret != 0)
+               SETTING_TRACE_ERROR("MMC vconf_ignore_key_changed failed");
 
        view_setting_about_status.is_create = 0;
        return SETTING_RETURN_SUCCESS;
@@ -110,6 +131,50 @@ static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it)
        return EINA_TRUE;
 }
 
+/**
+ * @brief Bluetooth vconf changed callback
+ *
+ * @param key the changed vconf key node.
+ * @param data application data
+ * @param event_info event type
+ */
+static void __vconf_change_cb(keynode_t *key, void *data)
+{
+       SETTING_TRACE_BEGIN;
+       int status;
+       char *vconf_name = NULL;
+       char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
+       SettingAbout *ad = (SettingAbout *)data;
+       setting_retm_if(!key, "key is NULL");
+       setting_retm_if(!ad, "data is NULL");
+
+       status = vconf_keynode_get_int(key);
+       vconf_name = vconf_keynode_get_name(key);
+
+       if (!safeStrCmp(vconf_name, VCONFKEY_BT_STATUS)) {
+               SETTING_TRACE("bt status: %d", status);
+               if (status && ad->item_data_bt) {
+                       __get_bluetooth_address(str, sizeof(str));
+                       G_FREE(ad->item_data_bt->sub_desc);
+                       ad->item_data_bt->sub_desc = (char *)g_strdup(str);
+                       elm_object_item_data_set(ad->item_data_bt->item,
+                                       ad->item_data_bt);
+                       elm_genlist_item_update(ad->item_data_bt->item);
+               }
+
+       } else if (!safeStrCmp(vconf_name, VCONFKEY_SYSMAN_MMC_STATUS)) {
+               SETTING_TRACE("MMC status: %d", status);
+               if (ad->item_data_storage) {
+                       __get_storage_capacity(str, sizeof(str));
+                       G_FREE(ad->item_data_storage->sub_desc);
+                       ad->item_data_storage->sub_desc = (char *)g_strdup(str);
+                       elm_object_item_data_set(ad->item_data_storage->item,
+                                       ad->item_data_storage);
+                       elm_genlist_item_update(ad->item_data_storage->item);
+               }
+       }
+}
+
 /**
  * @brief callback run for timer task to update CPU, Battery info
  *
@@ -127,7 +192,7 @@ static Eina_Bool __setting_about_status_timer_update_cb(void *data)
 
        if (ad->item_data_cpu) {
                float usr, sys;
-               int ret = __setting_about_status_stat_get_cpuinfo(&usr, &sys);
+               int ret = __stat_get_cpuinfo(&usr, &sys);
                if (ret == -ENOENT) {
                        SETTING_TRACE_ERROR("call __stat_get_cpuinfo fail");
                        snprintf(str, sizeof(str), "%s",
@@ -142,7 +207,7 @@ static Eina_Bool __setting_about_status_timer_update_cb(void *data)
        }
 
        if (ad->item_data_battery) {
-               __setting_about_status_get_battery_percent(str, sizeof(str));
+               __get_battery_percent(str, sizeof(str));
                /*SETTING_TRACE("str:%s", str);*/
                ad->item_data_battery->sub_desc = (char *)g_strdup(str);
 
@@ -153,7 +218,7 @@ static Eina_Bool __setting_about_status_timer_update_cb(void *data)
        return TRUE;
 }
 
-static int __setting_about_status_generate_genlist(void *data)
+static int __generate_genlist(void *data)
 {
        SettingAbout *ad = (SettingAbout *)data;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
@@ -162,8 +227,7 @@ static int __setting_about_status_generate_genlist(void *data)
        char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
 
        /* [UI] Phone Number */
-       memset(str, 0, sizeof(str));
-       __setting_about_status_get_phone_number(&ad->tel_h_list, str,
+       __get_phone_number(&ad->tel_h_list, str,
                                                sizeof(str));
        item_data = setting_create_Gendial_field_def(
                        ad->status_gl,
@@ -175,9 +239,9 @@ static int __setting_about_status_generate_genlist(void *data)
                elm_genlist_item_select_mode_set(item_data->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] IMEI */
-       memset(str, 0x00, sizeof(str));
-       int ret = __setting_about_status_get_imei(&ad->tel_h_list, str, sizeof(str));
+       int ret = __get_imei(&ad->tel_h_list, str, sizeof(str));
        if (ret == -1) {
                SETTING_TRACE_ERROR("call __stat_get_cpuinfo fail");
        }
@@ -191,22 +255,22 @@ static int __setting_about_status_generate_genlist(void *data)
                elm_genlist_item_select_mode_set(item_data->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Bluetooth address */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_bluetooth_address(str, sizeof(str));
-       item_data = setting_create_Gendial_field_def(
+       __get_bluetooth_address(str, sizeof(str));
+       ad->item_data_bt = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
                        NULL, SWALLOW_Type_INVALID, NULL,
                        NULL, 0, _("IDS_ST_MBODY_BLUETOOTH_ADDRESS"), str, NULL);
-       if (item_data) {
-               elm_object_item_disabled_set(item_data->item, EINA_TRUE);
-               elm_genlist_item_select_mode_set(item_data->item,
-               ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       if (ad->item_data_bt) {
+               elm_object_item_disabled_set(ad->item_data_bt->item, EINA_TRUE);
+               elm_genlist_item_select_mode_set(ad->item_data_bt->item,
+                               ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Wi-Fi MAC address */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_wifi_mac_address(str, sizeof(str));
+       __get_wifi_mac_address(str, sizeof(str));
        item_data = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
@@ -217,9 +281,9 @@ static int __setting_about_status_generate_genlist(void *data)
                elm_genlist_item_select_mode_set(item_data->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Serial number */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_serial_number(str, sizeof(str));
+       __get_serial_number(str, sizeof(str));
        item_data = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
@@ -230,37 +294,37 @@ static int __setting_about_status_generate_genlist(void *data)
                elm_genlist_item_select_mode_set(item_data->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Storage */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_storage_capacity(str, sizeof(str));
-       item_data = setting_create_Gendial_field_def(
+       __get_storage_capacity(str, sizeof(str));
+       ad->item_data_storage = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
                        NULL, SWALLOW_Type_INVALID, NULL,
                        NULL, 0, _("IDS_ST_BODY_STORAGE"), str, NULL);
-       if (item_data) {
-               elm_object_item_disabled_set(item_data->item, EINA_TRUE);
-               elm_genlist_item_select_mode_set(item_data->item,
+       if (ad->item_data_storage) {
+               elm_object_item_disabled_set(ad->item_data_storage->item,
+                               EINA_TRUE);
+               elm_genlist_item_select_mode_set(ad->item_data_storage->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Battery power */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_battery_percent(str, sizeof(str));
-       ad->item_data_battery = item_data = setting_create_Gendial_field_def(
-                       ad->status_gl,
-                       &(ad->itc_2text_2), NULL,
-                       NULL, SWALLOW_Type_INVALID, NULL,
-                       NULL, 0, _("IDS_ST_BODY_BATTERY_PERCENTAGE_ABB"), str, NULL);
-       if (item_data) {
-               elm_object_item_disabled_set(item_data->item, EINA_TRUE);
-               elm_genlist_item_select_mode_set(item_data->item,
+       __get_battery_percent(str, sizeof(str));
+       ad->item_data_battery = setting_create_Gendial_field_def(ad->status_gl,
+                       &(ad->itc_2text_2), NULL, NULL, SWALLOW_Type_INVALID,
+                       NULL, NULL, 0, _("IDS_ST_BODY_BATTERY_PERCENTAGE_ABB"),
+                       str, NULL);
+       if (ad->item_data_battery) {
+               elm_object_item_disabled_set(ad->item_data_battery->item,
+                               EINA_TRUE);
+               elm_genlist_item_select_mode_set(ad->item_data_battery->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
 
        /* [UI] CPU usage */
-       memset(str, 0, sizeof(str));
        float usr, sys;
-       ret = __setting_about_status_stat_get_cpuinfo(&usr, &sys);
+       ret = __stat_get_cpuinfo(&usr, &sys);
        if (ret == -ENOENT) {
                SETTING_TRACE_ERROR("call __stat_get_cpuinfo fail");
                snprintf(str, sizeof(str), "%s",
@@ -268,10 +332,9 @@ static int __setting_about_status_generate_genlist(void *data)
        } else {
                snprintf(str, sizeof(str), "%.0f%s", usr + sys, "\%");
        }
-       ad->item_data_cpu = item_data = setting_create_Gendial_field_def(
-                       ad->status_gl, &(ad->itc_2text_2), NULL,
-                       NULL, SWALLOW_Type_INVALID, NULL,
-                       NULL, 0, _("IDS_ST_BODY_CPU_USAGE"), str, NULL);
+       ad->item_data_cpu = setting_create_Gendial_field_def(ad->status_gl,
+                       &(ad->itc_2text_2), NULL, NULL, SWALLOW_Type_INVALID,
+                       NULL, NULL, 0, _("IDS_ST_BODY_CPU_USAGE"), str, NULL);
        if (ad->item_data_cpu) {
                elm_object_item_disabled_set(ad->item_data_cpu->item,
                                EINA_TRUE);
@@ -281,8 +344,7 @@ static int __setting_about_status_generate_genlist(void *data)
        }
 
        /* [UI] Device status */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_device_status(str, sizeof(str));
+       __get_device_status(str, sizeof(str));
        item_data = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
@@ -293,9 +355,9 @@ static int __setting_about_status_generate_genlist(void *data)
                elm_genlist_item_select_mode_set(item_data->item,
                ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        }
+
        /* [UI] Security status */
-       memset(str, 0x00, sizeof(str));
-       __setting_about_status_get_security_status(str, sizeof(str));
+       __get_security_status(str, sizeof(str));
        item_data = setting_create_Gendial_field_def(
                        ad->status_gl,
                        &(ad->itc_2text_2), NULL,
@@ -309,7 +371,7 @@ static int __setting_about_status_generate_genlist(void *data)
        return SETTING_RETURN_SUCCESS;
 }
 
-static void __setting_about_status_get_phone_number(
+static void __get_phone_number(
                        telephony_handle_list_s *list, char *str, int size)
 {
        char *phone_num = NULL;
@@ -330,7 +392,7 @@ static void __setting_about_status_get_phone_number(
        snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
 }
 
-static int __setting_about_status_get_imei(telephony_handle_list_s *list, char *str, int size)
+static int __get_imei(telephony_handle_list_s *list, char *str, int size)
 {
        if (!list) {
                SETTING_TRACE_ERROR("list is null");
@@ -358,76 +420,67 @@ static int __setting_about_status_get_imei(telephony_handle_list_s *list, char *
  * @param str the buffer for store bluetooth address
  * @param size buffer size
  */
-static void __setting_about_status_get_bluetooth_address(char *str, int size)
+static void __get_bluetooth_address(char *str, int size)
 {
        setting_retm_if(str == NULL, "str parameter is NULL");
 
        int ret = 0;
 
        ret = bt_initialize();
-       setting_retm_if(ret != 0, "bluetooth initialization failed");
 
        char *local_address = NULL;
        ret = bt_adapter_get_address(&local_address);
 
-       bt_adapter_state_e state;
-       ret = bt_adapter_get_state(&state);
-
        bt_deinitialize();
 
-       if (ret < 0 || BT_ADAPTER_DISABLED == state) {
-               snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
-               SETTING_TRACE_DEBUG(
-                               "bt address : %s failed get bt address with error code:%d",
-                               str, ret);
+       if (ret != BT_ERROR_NONE) {
+               if (ret == BT_ERROR_NOT_ENABLED)
+                       snprintf(str, size, "%s", _("IDS_ST_SBODY_DISABLED"));
+               else
+                       snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
+               SETTING_TRACE_DEBUG("failed to get BT address, error code: %d",
+                               ret);
        } else {
-               SETTING_TRACE_DEBUG("bt address : %s", local_address);
+               SETTING_TRACE_DEBUG("BT address: %s", local_address);
                snprintf(str, size, "%s", local_address);
+               free(local_address);
        }
-
-       free(local_address);
 }
 
-static void __setting_about_status_get_wifi_mac_address(char *str, int size)
+static void __get_wifi_mac_address(char *str, int size)
 {
-       setting_retm_if(str == NULL, "str parameter is NULL");
-       setting_retm_if(size < SETTING_ABOUT_WIFI_MAC_STR_LEN + 1,
-                       "size parameter is wrong");
-
+       wifi_manager_h wifi_handle = NULL;
        char *mac_addr = NULL;
-       int status = wifi_get_mac_address(&mac_addr);
-       if (WIFI_ERROR_NONE != status)
-               SETTING_TRACE_ERROR("Failed to call wifi_get_mac_address()");
-       else
-               SETTING_TRACE_ERROR("Success to call wifi_get_mac_address()");
+       int ret;
+       ret_if(str == NULL);
+       ret_if(size < SETTING_ABOUT_WIFI_MAC_STR_LEN + 1);
 
-       if (mac_addr) {
+       /* get wifi handle */
+       ret = wifi_manager_initialize(&wifi_handle);
+       ret_if(ret != WIFI_MANAGER_ERROR_NONE);
+
+       /* get wifi mac address */
+       ret = wifi_manager_get_mac_address(wifi_handle, &mac_addr);
+       if (ret == WIFI_MANAGER_ERROR_NONE && mac_addr) {
                safeCopyStr(str, mac_addr, SETTING_ABOUT_WIFI_MAC_STR_LEN);
-               SETTING_TRACE_DEBUG("get_wifi_mac_address : %s", mac_addr);
+               SETTING_TRACE_DEBUG("mac_address : %s", mac_addr);
                free(mac_addr);
-       }
-
-       SETTING_TRACE_DEBUG("get_wifi_mac_address : %s", str);
-
-       int state = 0;
-       int ret = vconf_get_int(VCONFKEY_WIFI_STATE, &state);
-       if (0 != ret)
-               SETTING_TRACE_ERROR("Failed to get wifi state");
-       else
-               SETTING_TRACE("get wifi state: %d", state);
-
-       if ((status != WIFI_ERROR_NONE) || (safeStrLen(str) == 0)
-                       || 0 == state) {
+       } else {
+               SETTING_TRACE_ERROR("Failed to get wifi mac address");
                snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
        }
+
+       /* release wifi handle */
+       ret = wifi_manager_deinitialize(wifi_handle);
+       ret_if(ret != WIFI_MANAGER_ERROR_NONE);
 }
 
-static void __setting_about_status_get_serial_number(char *str, int size)
+static void __get_serial_number(char *str, int size)
 {
        snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
 }
 
-static void __setting_about_status_get_storage_capacity(char *str, int size)
+static void __get_storage_capacity(char *str, int size)
 {
        long long int total = 0;
        long long int avail = 0;
@@ -464,7 +517,7 @@ static void __setting_about_status_get_storage_capacity(char *str, int size)
  * @param str the buffer for store battery percentage
  * @param size buffer size
  */
-static void __setting_about_status_get_battery_percent(char *str, int size)
+static void __get_battery_percent(char *str, int size)
 {
        setting_retm_if(str == NULL, "str parameter is NULL");
 
@@ -505,7 +558,7 @@ static void __setting_about_status_get_battery_percent(char *str, int size)
  *
  * @return -ENOENT means failed to get CPU info, otherwise ok.
  */
-static int __setting_about_status_stat_get_cpuinfo(float *usr_pct, float *sys_pct)
+static int __stat_get_cpuinfo(float *usr_pct, float *sys_pct)
 {
        setting_retvm_if(usr_pct == NULL, -ENOENT, "param usr_pct is null");
        setting_retvm_if(sys_pct == NULL, -ENOENT, "param sys_pct is null");
@@ -608,12 +661,12 @@ out:
        return ret;
 }
 /*TODO: try this int is_slp_binary()*/
-static void __setting_about_status_get_device_status(char *str, int size)
+static void __get_device_status(char *str, int size)
 {
        snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
 }
 
-static void __setting_about_status_get_security_status(char *str, int size)
+static void __get_security_status(char *str, int size)
 {
        snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
 }

diff --git a/setting-about/src/setting-about.c b/setting-about/src/setting-about.c
index 5d68ec98cce237a51159577481879c02fe098027..b4e3656eb5ec5fe06362585e2b8c7d4e40150906 100644 (file)
--- a/setting-about/src/setting-about.c
+++ b/setting-about/src/setting-about.c
@@ -94,30 +94,11 @@ static void on_app_pause(void *data)
 static void on_app_resume(void *data)
 {
        SETTING_TRACE_BEGIN;
+       Ecore_IMF_Context *imf_context = NULL;
        SettingAbout *ad = data;
        ret_if(!ad);
-       char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
-       Ecore_IMF_Context *imf_context = NULL;
 
        ad->pause_flag = FALSE;
-       memset(str, 0x00, MAX_DISPLAY_STR_LEN_ON_PHONE_INFO);
-       if (ad->item_data_wifi) {
-               //setting_about_main_get_wifi_mac_address_string(str,
-               //              MAX_DISPLAY_STR_LEN_ON_PHONE_INFO);
-               ad->item_data_wifi->sub_desc = (char *)g_strdup(str);
-               elm_object_item_data_set(ad->item_data_wifi->item,
-                               ad->item_data_wifi);
-               elm_genlist_item_update(ad->item_data_wifi->item);
-       }
-       memset(str, 0, MAX_DISPLAY_STR_LEN_ON_PHONE_INFO);
-       if (ad->item_data_bt) {
-               //setting_about_main_get_bluetooth_address_string(str,
-               //              MAX_DISPLAY_STR_LEN_ON_PHONE_INFO);
-               ad->item_data_bt->sub_desc = (char *)g_strdup(str);
-               elm_object_item_data_set(ad->item_data_bt->item,
-                               ad->item_data_bt);
-               elm_genlist_item_update(ad->item_data_bt->item);
-       }
 
        if (ad->item_dev_name) {
                if (elm_object_focus_get(ad->item_dev_name->eo_check)) {