[Storage] Cleaning and fixes

Change-Id: I98b365671ee6b47385ff3943661355311362323a
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-storage/include/setting-storage-applications-utils.h b/setting-storage/include/setting-storage-applications-utils.h
index 05a194439a835a45987f5e5015744bfccc5ebd77..14d4b65f6f97032fa6022b220d1385677d2fd5ba 100644 (file)
--- a/setting-storage/include/setting-storage-applications-utils.h
+++ b/setting-storage/include/setting-storage-applications-utils.h
@@ -19,8 +19,6 @@
 #ifndef __SETTING_STORAGE_APPLICATIONS_UTILS_H__
 #define __SETTING_STORAGE_APPLICATIONS_UTILS_H__
 
-#include <package_manager.h>
-
 #include "setting-storage.h"
 
 /* Sorting functionality */

diff --git a/setting-storage/include/setting-storage-string.h b/setting-storage/include/setting-storage-string.h
index 81c581f6f7a397f0c5b804977d4313b58c56673a..65d873b8df532e88daa799f7ba155c25d2dee49e 100644 (file)
--- a/setting-storage/include/setting-storage-string.h
+++ b/setting-storage/include/setting-storage-string.h
@@ -25,12 +25,9 @@
 #define STORAGE_STR_FAIL "IDS_CST_POP_FAILED"
 #define STORAGE_STR_OK "IDS_ST_BUTTON_OK"
 #define STORAGE_STR_CANCEL "IDS_ST_BUTTON_CANCEL_ABB"
-#define STORAGE_STR_BACK "IDS_ST_BUTTON_BACK"
+
 #define STORAGE_STR_DELETE "IDS_ST_BODY_DELETE"
-#define STORAGE_STR_BT "IDS_ST_BODY_BLUETOOTH"
-#define STORAGE_STR_NFC "IDS_ST_BODY_NFC"
 #define STORAGE_STR_DELETE_Q "IDS_ST_POP_DELETE_Q"
-#define STORAGE_STR_NO_FILES "IDS_VR_POP_NO_FILES"
 
 #define STORAGE_STR_INTERNAL_STORAGE "IDS_ST_BODY_DEVICE_MEMORY"
 
@@ -49,14 +46,11 @@
 #define STORAGE_STR_MOUNT_USB "IDS_ST_BODY_MOUNT_USB_OTG_STORAGE"
 #define STORAGE_STR_UNMOUNT_USB "IDS_ST_BODY_UNMOUNT_USB_OTG_STORAGE"
 #define STORAGE_STR_FORMAT_USB "IDS_ST_BODY_FORMAT_USB_OTG_STORAGE"
-#define STORAGE_STR_FORMAT_END "IDS_MF_POP_FORMAT_COMPLETED"
 
 #define STORAGE_STR_SD_UNMOUNT_POPUP_MSG \
        "IDS_ST_BODY_UNMOUNTING_THE_SD_CARD_WILL_STOP_SOME_APPLICATIONS_FROM_F"\
        "UNCTIONING_UNTIL_YOU_MOUNT_THE_SD_CARD_AGAIN_MSG"
-#define STORAGE_STR_FORMAT_MSG \
-       "IDS_ST_BODY_THIS_ACTION_WILL_ERASE_THE_SD_CARD_IN_THE_PHONE_YOU_WILL_"\
-       "LOSE_ALL_DATA_ON_THE_CARD_E"
+
 #define STORAGE_STR_FORMAT_USE_MSG \
        "IDS_ST_BODY_THE_SD_CARD_IS_CURRENTLY_IN_USE_THIS_ACTION_WILL_ERASE_AL"\
        "L_DATA_ON_THE_SD_CARD_INCLUDING_THE_DATA_THAT_IS_CURRENTLY_BEING_USED"
@@ -82,14 +76,7 @@
 
 /* For default view */
 #define STORAGE_STR_SHARED_CONTENTS "IDS_ST_HEADER_SHARED_CONTENT"
-#define STORAGE_STR_WIFI "IDS_ST_HEADER_WI_FI_DIRECT"
-#define STORAGE_STR_DOWNLOAD "IDS_ST_BODY_DOWNLOAD"
 #define STORAGE_STR_APP "IDS_ST_BODY_APPLICATION"
-#define STORAGE_STR_INSTALLED_APP_H "IDS_ST_HEADER_INSTALLED_APPLICATIONS"
-#define STORAGE_STR_INSTALLED_APP_B "IDS_ST_BODY_INSTALLED_APPLICATIONS"
-#define STORAGE_STR_APP_LOC_NOTICE \
-       "IDS_ST_BODY_SET_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPLICATIONS_MSG"
-
 
 /* For miscellaneous file view */
 #define STORAGE_STR_N_SELECTED "IDS_ST_HEADER_PD_SELECTED_ABB"

diff --git a/setting-storage/include/setting-storage-utils.h b/setting-storage/include/setting-storage-utils.h
index f2f8ec4e287f4dda823bb3ac5832119a6b4b4a60..d07834d376dc7b280e0d949975e98697585a2dd6 100644 (file)
--- a/setting-storage/include/setting-storage-utils.h
+++ b/setting-storage/include/setting-storage-utils.h
@@ -22,7 +22,7 @@
 #include "setting-storage.h"
 
 void storage_popup_del(void *data, Evas_Object *obj, void *event_info);
-void storage_get_internal_storage_status();
+void storage_get_internal_storage_status(double *total, double *avail);
 void storage_get_external_storage_status(const char *path, double *total,
                double *avail);
 

diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h
index 8896a2f80a28bdfa062f411c77d3a1329a305b00..f2afd0fd889de64548d2328ea9c8ef936c56084d 100755 (executable)
--- a/setting-storage/include/setting-storage.h
+++ b/setting-storage/include/setting-storage.h
@@ -23,7 +23,6 @@
 #ifndef __SETTING_STORAGE_H__
 #define __SETTING_STORAGE_H__
 
-#include <string.h>
 #include <pthread.h>
 
 #include <Elementary.h>
@@ -42,9 +41,6 @@ extern const char *storage_ENCRYPT_stat;
 #define SETTING_STORAGE_STR_SELECT_APPS "Select apps"
 #define SETTING_STORAGE_STR_SELECT_FILES "Select files"
 
-#define SETTING_STORAGE_DEFAULT_STORAGE_APP_DESP_SIZE \
-       (240 * WIDGET_SCALE_FACTOR)
-
 #define SETTING_STORAGE_POPUP_TIMER    2
 
 #define SAFE_STRDUP(src) (src) ? strdup(src) : NULL
@@ -59,12 +55,9 @@ typedef struct _SettingStorage {
        setting_view *misces_view;
        setting_view *apps_view;
 
-       Ecore_Timer *event_freeze_timer;
-
        /* storage setting */
        Evas_Object *popup;
 
-       Elm_Genlist_Item_Class itc_1icon_1text_sub;
        Elm_Genlist_Item_Class itc_2text_2;
        Elm_Genlist_Item_Class itc_group_item;
        Elm_Genlist_Item_Class itc_1text;
@@ -82,7 +75,6 @@ typedef struct _SettingStorage {
        double sz_caches;
        double sz_sys;
 
-       Setting_GenGroupItem_Data *total_space;
        Setting_GenGroupItem_Data *sys_mem;
        Setting_GenGroupItem_Data *apps;
        Setting_GenGroupItem_Data *images;
@@ -90,7 +82,7 @@ typedef struct _SettingStorage {
        Setting_GenGroupItem_Data *audio;
        Setting_GenGroupItem_Data *misces;
        Setting_GenGroupItem_Data *caches;
-       Setting_GenGroupItem_Data *avail;
+
        pkgmgr_client *pc;
        pkgmgr_client *pc_total_size;
 
@@ -114,7 +106,6 @@ typedef struct _SettingStorage {
        Setting_GenGroupItem_Data *usb_available;
        Setting_GenGroupItem_Data *usb_unmount;
        Setting_GenGroupItem_Data *usb_format;
-       Elm_Object_Item *usb_sep_item;
 
        int usb_otg_status;
        int usb_request;
@@ -122,7 +113,6 @@ typedef struct _SettingStorage {
 
        void *size_worker;
 
-       Ecore_Idler *update_idler;
        Ecore_Timer *update_timer;
 
        /* default storage */
@@ -185,14 +175,4 @@ typedef enum {
        BY_FREQUENCY
 } sort_type_t;
 
-typedef struct {
-       pthread_t tid;
-
-       double video_total;
-       double audio_total;
-       double misces_total;
-
-       SettingStorage *ad;
-} storage_worker_data;
-
 #endif /*__SETTING_STORAGE_H__ */

diff --git a/setting-storage/src/setting-storage-USB.c b/setting-storage/src/setting-storage-USB.c
index 2903287206a434f9e018a3af8d3ed383781cb50a..d19a6181ddbef929906b01205ef80365644799cc 100644 (file)
--- a/setting-storage/src/setting-storage-USB.c
+++ b/setting-storage/src/setting-storage-USB.c
@@ -93,10 +93,9 @@ static void storage_USB_unmount_resp(void *data, Evas_Object *obj,
        ret_if(data == NULL);
 
        response_type = btn_type(obj);
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        if (POPUP_RESPONSE_OK == response_type) {
                ad->usb_request = STORAGE_USB_REQ_UNMOUNT;
@@ -113,10 +112,9 @@ static void storage_USB_format_se_confirm(void *data, Evas_Object *obj,
        ret_if(data == NULL);
 
        response_type = btn_type(obj);
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        if (POPUP_RESPONSE_OK == response_type) {
                ad->usb_request = STORAGE_USB_REQ_UNMOUNT_BEFORE_FORMAT;
@@ -133,14 +131,11 @@ static void storage_USB_format_first_confirm(void *data, Evas_Object *obj,
        ret_if(data == NULL);
 
        response_type = btn_type(obj);
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        if (POPUP_RESPONSE_OK == response_type) {
-               if (ad->popup)
-                       evas_object_del(ad->popup);
+               evas_object_del(ad->popup);
 
                ad->popup = setting_create_popup(ad, ad->md.window, NULL,
                STORAGE_STR_USB_FORMAT_SECOND_Q,
@@ -167,10 +162,8 @@ static void storage_main_USB_sel(void *data, Evas_Object *obj,
 
        SETTING_TRACE("clicking item[%s]", list_item->keyStr);
 
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        if (list_item == ad->usb_mount) {
                storage_USB_mount(ad);
@@ -214,10 +207,6 @@ static inline void storage_USB_remove_info(SettingStorage *ad)
                elm_object_item_del(ad->usb_format->item);
                ad->usb_format = NULL;
        }
-       if (ad->usb_sep_item) {
-               elm_object_item_del(ad->usb_sep_item);
-               ad->usb_sep_item = NULL;
-       }
 }
 
 static inline void storage_USB_append_mounted_info(SettingStorage *ad)
@@ -321,10 +310,8 @@ static void storage_USB_cb(char *type, char *path, int mount, void *data)
        FREE(ad->usb_otg_path);
        ad->usb_otg_path = SAFE_STRDUP(path);
 
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        if (!strcmp(type, "storage_remove")) {
                ad->usb_otg_status = SETTING_STORAGE_USB_OTG_REMOVE;

diff --git a/setting-storage/src/setting-storage-main.c b/setting-storage/src/setting-storage-main.c
index f2696a12bdea540084a94ace7182dbaf843d69bb..dbb6c7d470c8483fff96aeb4ef12bbd9db503c88 100755 (executable)
--- a/setting-storage/src/setting-storage-main.c
+++ b/setting-storage/src/setting-storage-main.c
@@ -274,10 +274,8 @@ static void __storage_cache_file_clean_popup_no_cache_rsp_cb(void *data,
                }
        }
 
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        SETTING_TRACE_END;
 }
@@ -322,10 +320,8 @@ static void __storage_cache_file_clean_popup_rsp_cb(void *data,
                break;
        }
 
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
 
        SETTING_TRACE_END;
 }
@@ -606,20 +602,14 @@ static int _view_destroy(void *data)
 
        storage_stop_async_worker_all();
 
-       if (ad->update_idler) {
-               ecore_idler_del(ad->update_idler);
-               ad->update_idler = NULL;
-       }
-
        if (ad->update_timer) {
                ecore_timer_del(ad->update_timer);
                ad->update_timer = NULL;
        }
 
-       if (ad->popup) {
-               evas_object_del(ad->popup);
-               ad->popup = NULL;
-       }
+       evas_object_del(ad->popup);
+       ad->popup = NULL;
+
        if (ad->pc) {
                pkgmgr_client_free(ad->pc);
                ad->pc = NULL;

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index 308d6e68c4c9d2b9ba990f365265a3abbd225910..914805c7adf85c998c71347bfca867bc2669c326 100755 (executable)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -64,20 +64,18 @@ static void _setting_storage_app_on_app_ctl(app_control_h app_control,
 /********************************OTHER***************************************/
 static void _main_win_del_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       SETTING_TRACE_BEGIN;
-
        elm_exit();
 }
 
 static void _storage_vconf_change_cb(keynode_t *key, void *data)
 {
-       char *vconf_name;
+       char *vconf_name = NULL;
        SettingStorage *ad = data;
 
        ret_if(data == NULL);
 
        vconf_name = vconf_keynode_get_name(key);
-       if (NULL == vconf_name)
+       if (!vconf_name)
                return;
 
        if (ad->graph_genlist_it)