[SM]Writing mobile cycle start/inverval fixed

Change-Id: Ia459eaa049693f22102b588c2f3ab15668e3fd1a
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 8c5ee3cc88e4a274ea1a4366419c61c7c5762081..e5c420e9cd1a46e87b756ea1760272a558f8e358 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
@@ -596,7 +596,6 @@ static void _custom_cycle_popup_cancel_cb(void *data, Evas_Object *obj,
 static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       bool res = false;
        int value = 0;
        Cycle_Start_Popup_Data_T *cycle_start_popup_data =
                        (Cycle_Start_Popup_Data_T *)data;
@@ -622,17 +621,16 @@ static void _custom_cycle_popup_ok_cb(void *data, Evas_Object *obj,
                        complement_data_usage_mobile_genlist(
                                                        cycle_start_popup_data->smd->mobile_data_setting_genlist,
                                                        cycle_start_popup_data->smd);
+
+                       if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1) {
+                               write_sim_1_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
+                       } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2) {
+                               write_sim_2_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
+                       }
+
                        evas_object_del(cycle_start_popup_data->popup);
                }
        }
-
-       if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1)  {
-               res = write_sim_1_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
-       } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2)  {
-               res = write_sim_2_cycle_interval(cycle_start_popup_data->smd->selected_sim_limits->custom_mode_interval);
-       }
-
-       ret_if(!res);
 }
 
 static void _custom_cycle_popup_del_cb(void *data, Evas *e, Evas_Object *obj,
@@ -705,7 +703,6 @@ static struct tm _get_margin_date(margin_date_type date_type)
 static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       bool res = false;
        char buf[256] = {0};
        char margin_date_buf[256] = {0};
        time_t set_date = 0;
@@ -734,16 +731,15 @@ static void _custom_start_date_popup_ok_cb(void *data, Evas_Object *obj,
        } else {
                cycle_start_popup_data->smd->selected_sim_limits->cycle_start = set_date;
                complement_data_usage_mobile_genlist(cycle_start_popup_data->smd->mobile_data_setting_genlist, cycle_start_popup_data->smd);
-               evas_object_del(cycle_start_popup_data->popup);
-       }
 
-       if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1)  {
-               res = write_sim_1_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
-       } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2)  {
-               res = write_sim_2_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
-       }
+               if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_1)  {
+                       write_sim_1_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
+               } else if (cycle_start_popup_data->smd->selected_sim_subscriber_id == cycle_start_popup_data->smd->subscriber_id_2)  {
+                       write_sim_2_cycle_start(cycle_start_popup_data->smd->selected_sim_limits->cycle_start);
+               }
 
-       ret_if(!res);
+               evas_object_del(cycle_start_popup_data->popup);
+       }
 }
 
 static void _custom_start_date_popup_del_cb(void *data, Evas *e, Evas_Object *obj,
@@ -918,6 +914,13 @@ static void _timer_popup_done_cb(void *data, Evas_Object *obj, void *event_info)
        elements[ELEMENT_TYPE_START_DATE].value = strdup(buf);
        elm_genlist_realized_items_update(
                        cycle_start_data->smd->mobile_data_setting_genlist);
+
+       if (cycle_start_data->smd->selected_sim_subscriber_id == cycle_start_data->smd->subscriber_id_1)  {
+               write_sim_1_cycle_start(cycle_start_data->smd->selected_sim_limits->cycle_start);
+       } else if (cycle_start_data->smd->selected_sim_subscriber_id == cycle_start_data->smd->subscriber_id_2)  {
+               write_sim_2_cycle_start(cycle_start_data->smd->selected_sim_limits->cycle_start);
+       }
+
        evas_object_del(cycle_start_data->popup);
 }
 
@@ -978,7 +981,6 @@ static void _genlist_radio_del(void *data, Evas_Object *obj)
        Radio_List_Item_T *item_data = (Radio_List_Item_T *)data;
        free(item_data->text);
        free(item_data);
-
 }
 
 static Elm_Gen_Item_Class *_create_genlist_1_line_class(Elm_Gen_Item_Content_Get_Cb _genlist_radio_content_get)
@@ -1020,7 +1022,6 @@ static void _radio_cycle_selected_cb(void *data, Evas_Object *obj, void *event_i
        }
 
        ret_if(!res);
-
 }
 
 static Evas_Object *_genlist_cycle_radio_content_get(void *data, Evas_Object *obj, const char *part)
@@ -1055,7 +1056,6 @@ static void _radio_start_date_selected_cb(void *data, Evas_Object *obj, void *ev
        complement_data_usage_mobile_genlist(item_data->smd->mobile_data_setting_genlist, item_data->smd);
 
        evas_object_del(item_data->popup);
-
 }
 
 static Evas_Object *_genlist_start_date_radio_content_get(void *data, Evas_Object *obj, const char *part)
@@ -1079,6 +1079,12 @@ static Evas_Object *_genlist_start_date_radio_content_get(void *data, Evas_Objec
        if (item_data->smd->selected_sim_limits->cycle_start == item_data->radio_value)
                elm_radio_value_set(radio, item_data->radio_value);
 
+       if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_1)  {
+               write_sim_1_cycle_start(item_data->smd->selected_sim_limits->cycle_start);
+       } else if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_2)  {
+               write_sim_2_cycle_start(item_data->smd->selected_sim_limits->cycle_start);
+       }
+
        return radio;
 }
 
@@ -1115,6 +1121,12 @@ void _radio_start_date_list_item_selected_cb(void *data, Evas_Object *obj, void
        _update_genlist_start_date_item(item_data->smd);
 
        evas_object_del(item_data->popup);
+
+       if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_1)  {
+               write_sim_1_cycle_start(item_data->smd->selected_sim_limits->cycle_start);
+       } else if (item_data->smd->selected_sim_subscriber_id == item_data->smd->subscriber_id_2)  {
+               write_sim_2_cycle_start(item_data->smd->selected_sim_limits->cycle_start);
+       }
 }
 
 static void _create_list_popup(SmartMgrData *smd, char *title, Element_Type_E type)
@@ -1204,8 +1216,6 @@ static int _destroy(void *data)
 
 static int _update(void* data)
 {
-       SETTING_TRACE_BEGIN;
-
        SmartMgrData *smd = (SmartMgrData*)data;
        retv_if(NULL == smd, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);