[SM][Mob]Code shortening and cleanup

Change-Id: I223848c405cf5ebf67c0b439c39033b92a4b54f3
Signed-off-by: Pawel Aksiutowicz <p.aksiutowic@partner.samsung.com>

diff --git a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
index b8a4af0ff06731eb2b4d5c75577adab2e16aeac5..7b5e83baa2495eb00f3e4459c700c1b4ea860d9a 100755 (executable)
--- a/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
+++ b/setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
@@ -391,33 +391,17 @@ Evas_Object *_create_popup(SmartMgrData *smd, char *title)
        return popup;
 }
 
-void write_cycle_interval(SmartMgrData *smd)
+void write_cycle_info(SmartMgrData *smd)
 {
        if (smd->selected_sim_subscriber_id == smd->subscriber_id_1) {
-               write_sim_1_cycle_interval(smd->selected_sim_limits->custom_mode_interval);
-       }
-       if (smd->selected_sim_subscriber_id == smd->subscriber_id_2) {
-               write_sim_2_cycle_interval(smd->selected_sim_limits->custom_mode_interval);
-       }
-}
-
-void write_cycle_mode(SmartMgrData *smd)
-{
-       if (smd->selected_sim_subscriber_id == smd->subscriber_id_1)  {
                write_sim_1_cycle_mode(smd->selected_sim_limits->cycle_mode);
+               write_sim_1_cycle_start(smd->selected_sim_limits->cycle_start);
+               write_sim_1_cycle_interval(smd->selected_sim_limits->custom_mode_interval);
        }
        if (smd->selected_sim_subscriber_id == smd->subscriber_id_2) {
                write_sim_2_cycle_mode(smd->selected_sim_limits->cycle_mode);
-       }
-}
-
-void write_cycle_start(SmartMgrData *smd)
-{
-       if (smd->selected_sim_subscriber_id == smd->subscriber_id_1)  {
-               write_sim_1_cycle_start(smd->selected_sim_limits->cycle_start);
-       }
-       if (smd->selected_sim_subscriber_id == smd->subscriber_id_2)  {
                write_sim_2_cycle_start(smd->selected_sim_limits->cycle_start);
+               write_sim_2_cycle_interval(smd->selected_sim_limits->custom_mode_interval);
        }
 }
 
@@ -447,7 +431,7 @@ static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                        smd->selected_sim_limits->custom_mode_interval = value;
                        elm_genlist_realized_items_update(mobile_genlist);
 
-                       write_cycle_interval(smd);
+                       write_cycle_info(smd);
 
                        evas_object_del(popup_info.popup);
                }
@@ -533,8 +517,7 @@ static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
                smd->selected_sim_limits->cycle_start = set_date;
                elm_genlist_realized_items_update(mobile_genlist);
 
-               write_cycle_mode(smd);
-               write_cycle_start(smd);
+               write_cycle_info(smd);
 
                evas_object_del(popup_info.popup);
        }
@@ -697,18 +680,16 @@ void _radio_cycle_list_item_selected_cb(void *data, Evas_Object *obj, void *even
                item_data->smd->selected_sim_limits->cycle_mode = item_data->radio_value;
                item_data->smd->selected_sim_limits->cycle_start = 1;
                elm_radio_value_set(cycle_mode_radio_group, item_data->smd->selected_sim_limits->cycle_mode);
+               generate_list(mobile_genlist, item_data->smd);
+               elm_genlist_realized_items_update(mobile_genlist);
        }
 
-       generate_list(mobile_genlist, item_data->smd);
-       elm_genlist_realized_items_update(mobile_genlist);
-
        if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, "Set data usage cycle", item_data->smd->selected_sim_limits->custom_mode_interval);
 
        evas_object_del(item_data->popup);
 
-       write_cycle_mode(item_data->smd);
-       write_cycle_start(item_data->smd);
+       write_cycle_info(item_data->smd);
 }
 
 static Elm_Widget_Item *_append_item_to_radio_list(SmartMgrData *smd, Evas_Object *popup, Evas_Object *genlist, Elm_Gen_Item_Class *itc,
@@ -738,22 +719,20 @@ static void _radio_cycle_selected_cb(void *data, Evas_Object *obj, void *event_i
 {
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
-       if  (item_data->smd->selected_sim_limits->cycle_mode != item_data->radio_value) {
+       if (item_data->smd->selected_sim_limits->cycle_mode != item_data->radio_value) {
                item_data->smd->selected_sim_limits->cycle_mode = item_data->radio_value;
                item_data->smd->selected_sim_limits->cycle_start = 1;
                elm_radio_value_set(cycle_mode_radio_group, item_data->smd->selected_sim_limits->cycle_mode);
+               generate_list(mobile_genlist, item_data->smd);
+               elm_genlist_realized_items_update(mobile_genlist);
        }
 
-       generate_list(mobile_genlist, item_data->smd);
-       elm_genlist_realized_items_update(mobile_genlist);
-
        if (item_data->smd->selected_sim_limits->cycle_mode == CYCLE_MODE_CUSTOM)
                _create_custom_cycle_popup(item_data->smd, "Set data usage cycle", item_data->smd->selected_sim_limits->custom_mode_interval);
 
        evas_object_del(item_data->popup);
 
-       write_cycle_mode(item_data->smd);
-       write_cycle_start(item_data->smd);
+       write_cycle_info(item_data->smd);
 
 }
 
@@ -773,21 +752,19 @@ static Evas_Object *_genlist_cycle_radio_content_get(void *data, Evas_Object *ob
        elm_radio_state_value_set(radio, item_data->radio_value);
        evas_object_smart_callback_add(radio, "changed", _radio_cycle_selected_cb, data);
 
-       if (item_data->radio_value == item_data->smd->selected_sim_limits->cycle_mode)
-               elm_radio_value_set(start_weekday_radio_group, item_data->smd->selected_sim_limits->cycle_mode);
+       elm_radio_value_set(start_weekday_radio_group, item_data->smd->selected_sim_limits->cycle_mode);
 
        return radio;
 }
 
 static void _create_cycle_list_popup(void *data, Evas_Object *obj, void *event_info)
 {
+       int i;
+       Evas_Object *genlist = NULL;
        SmartMgrData *smd = (SmartMgrData *)data;
 
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
        elm_genlist_item_selected_set(item, EINA_FALSE);
-
-       int i;
-       Evas_Object *genlist = NULL;
        Evas_Object *popup = setting_create_popup_with_list(&genlist, NULL, smd->md.naviframe, "Select data usage cycle", NULL, 0, EINA_TRUE, EINA_FALSE, 0);
 
        cycle_mode_radio_group = elm_radio_add(genlist);
@@ -807,21 +784,19 @@ static void _monthly_start_date_popup_done_cb(void *data, Evas_Object *obj, void
                        elm_spinner_value_get(popup_info.content);
        elm_genlist_realized_items_update(mobile_genlist);
 
-       write_cycle_mode(smd);
-       write_cycle_start(smd);
+       write_cycle_info(smd);
 
        evas_object_del(popup_info.popup);
 }
 
 static void _create_monthly_start_date_popup(void *data, Evas_Object *obj, void *event_info)
 {
+       Evas_Object *date_time = NULL;
+       Evas_Object *box = NULL;
        SmartMgrData *smd = (SmartMgrData *)data;
        Elm_Object_Item *item = (Elm_Object_Item *)event_info;
        elm_genlist_item_selected_set(item, EINA_FALSE);
 
-       Evas_Object *date_time = NULL;
-       Evas_Object *box = NULL;
-
        popup_info.popup = _create_popup(smd, "Select start date");
        box = _create_box(popup_info.popup);
        date_time = elm_spinner_add(box);
@@ -851,8 +826,7 @@ void _radio_start_weekday_list_item_selected_cb(void *data, Evas_Object *obj, vo
 
        evas_object_del(item_data->popup);
 
-       write_cycle_mode(item_data->smd);
-       write_cycle_start(item_data->smd);
+       write_cycle_info(item_data->smd);
 }
 
 static void _radio_start_weekday_selected_cb(void *data, Evas_Object *obj, void *event_info)
@@ -869,8 +843,8 @@ static void _radio_start_weekday_selected_cb(void *data, Evas_Object *obj, void
 
 static Evas_Object *_genlist_start_weekday_radio_content_get(void *data, Evas_Object *obj, const char *part)
 {
-       int len = strlen("elm.swallow.end");
        Evas_Object *radio = NULL;
+       int len = strlen("elm.swallow.end");
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
 
        if (len != strlen(part) || strncmp("elm.swallow.end", part, len))
@@ -882,11 +856,10 @@ static Evas_Object *_genlist_start_weekday_radio_content_get(void *data, Evas_Ob
        elm_radio_group_add(radio, start_weekday_radio_group);
        elm_radio_state_value_set(radio, item_data->radio_value);
        evas_object_smart_callback_add(radio, "changed", _radio_start_weekday_selected_cb, data);
-       if (item_data->radio_value == item_data->smd->selected_sim_limits->cycle_start)
-               elm_radio_value_set(start_weekday_radio_group, item_data->smd->selected_sim_limits->cycle_start);
 
-       write_cycle_mode(item_data->smd);
-       write_cycle_start(item_data->smd);
+       elm_radio_value_set(start_weekday_radio_group, item_data->smd->selected_sim_limits->cycle_start);
+
+       write_cycle_info(item_data->smd);
 
        return radio;
 }
@@ -955,8 +928,6 @@ static int _create(void *data)
 
 static int _destroy(void *data)
 {
-       retv_if(NULL == data, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
        sm_view_data_usage_mobile.is_create = 0;
        return 0;
 }
@@ -1047,6 +1018,7 @@ static char *_limit_item_label_get(void *data, Evas_Object *obj, const char *par
                }
                return strdup(buf);
        }
+
        if (!strcmp(part, "elm.text.sub"))
                return strdup(_("Limit"));
        return NULL;
@@ -1078,43 +1050,31 @@ static char *_start_date_item_label_get(void *data, Evas_Object *obj, const char
        retv_if(!smd, NULL);
 
        char buf[256] = {0};
-       struct tm min_date = {0};
-       struct tm *time = {0};
+       struct tm time = {0};
 
        if (!strcmp(part, "elm.text")) {
-               if (smd->selected_sim_limits->cycle_start > 1) {
-                               switch (smd->selected_sim_limits->cycle_mode) {
-                               case CYCLE_MODE_MONTHLY:
-                                       snprintf(buf, sizeof(buf), "%d", smd->selected_sim_limits->cycle_start);
-                                       break;
-                               case CYCLE_MODE_WEEKLY:
-                                       snprintf(buf, sizeof(buf), "%s", elements_cycle_day_of_week[smd->selected_sim_limits->cycle_start-1]);
-                                       break;
-                               case CYCLE_MODE_DAILY:
-                                       break;
-                               case CYCLE_MODE_CUSTOM:
-                                       time = localtime((time_t*)&smd->selected_sim_limits->cycle_start);
-                                       strftime(buf, sizeof(buf), date_format, time);
-                                       break;
-                               }
+               switch (smd->selected_sim_limits->cycle_mode) {
+               case CYCLE_MODE_MONTHLY:
+                       snprintf(buf, sizeof(buf), "%d", smd->selected_sim_limits->cycle_start);
+                       break;
+               case CYCLE_MODE_WEEKLY:
+                       snprintf(buf, sizeof(buf), "%s", elements_cycle_day_of_week[smd->selected_sim_limits->cycle_start-1]);
+                       break;
+               case CYCLE_MODE_DAILY:
+                       break;
+               case CYCLE_MODE_CUSTOM:
+                       if (smd->selected_sim_limits->cycle_start > 1) {
+                               time = *localtime((time_t*)&smd->selected_sim_limits->cycle_start);
                        } else {
-                               switch (smd->selected_sim_limits->cycle_mode) {
-                               case CYCLE_MODE_MONTHLY:
-                                       snprintf(buf, sizeof(buf), "%d", smd->selected_sim_limits->cycle_start);
-                                       break;
-                               case CYCLE_MODE_WEEKLY:
-                                       snprintf(buf, sizeof(buf), "%s", elements_cycle_day_of_week[0]);
-                                       break;
-                               case CYCLE_MODE_DAILY:
-                                       break;
-                               case CYCLE_MODE_CUSTOM:
-                                       min_date = _get_margin_date(DATE_MIN);
-                                       smd->selected_sim_limits->cycle_start = (int)mktime(&min_date);
-                                       strftime(buf, sizeof(buf), date_format, &min_date);
-                                       break;
-                               }
+                               time = _get_margin_date(DATE_MIN);
+                               smd->selected_sim_limits->cycle_start = (int)mktime(&time);
                        }
 
+                       strftime(buf, sizeof(buf), date_format, &time);
+                       write_cycle_info(smd);
+                       break;
+               }
+
                return strdup(buf);
        }