Ringtone module

- Uncommented code regarding add/remove user custom ringtones

Change-Id: Id17f06a5916723c01a56bcf670eb96b80a2c026b
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/setting-ringtone/src/setting-ringtone-main.c b/setting-ringtone/src/setting-ringtone-main.c
index d22a48a82c4bde64d7f40db2a103a37773b23388..b306b93d29f0dead24c9e3e67cb9ddaddf8481cf 100755 (executable)
--- a/setting-ringtone/src/setting-ringtone-main.c
+++ b/setting-ringtone/src/setting-ringtone-main.c
@@ -75,8 +75,8 @@ static void _show_more_menu_cb(void *data, Evas_Object *more_button,
                                void *event_info);
 
 static void _append_default_ringtones(SettingRingtoneData *ad);
-/*static void _system_setting_get_ringtone_list_cb(int key,
-                                               void *data, void *user_data); */
+
+static bool _system_setting_get_ringtone_list_cb(int index, const char* value, void *user_data);
 static void _create_main_ui_list(SettingRingtoneData *ad);
 
 
@@ -442,15 +442,13 @@ static void _music_chooser_appctl_reply_cb(app_control_h request,
 
        ret_if(ret != 0 || arr_len <= 0);
 
-#if 0
        ret = system_settings_add_value_string(
                        SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
                        selected_file_paths[0]);
-#endif
+
        free(selected_file_paths);
-#if 0
+
        ret_if(ret != 0);
-#endif
 
        setting_view_update(&setting_view_ringtone_main, ad);
 }
@@ -550,21 +548,20 @@ static void _append_default_ringtones(SettingRingtoneData *ad)
        }
 }
 
-#if 0
-static void _system_setting_get_ringtone_list_cb(int key,
-                                               void *data, void *user_data)
+static bool _system_setting_get_ringtone_list_cb(int index,
+                                               const char *value, void *user_data)
 {
        SETTING_TRACE_BEGIN;
        fileNodeInfo *pNode = NULL;
-       char *pathval = data;
+       const char *pathval = value;
        char *tmp_path_1 = NULL;
        char *tmp_path_2 = NULL;
        SettingRingtoneData *ad = (SettingRingtoneData *)user_data;
        SETTING_TRACE(" *** RINGTONE FILE NAME IN SETTING (%d) : %s *** ",
-                       key, pathval);
+                       index, pathval);
 
        pNode = (fileNodeInfo *)calloc(1, sizeof(fileNodeInfo));
-       ret_if(!pNode);
+       retv_if(!pNode, false);
 
        tmp_path_1 = strdup(pathval);
        tmp_path_2 = strdup(pathval);
@@ -586,23 +583,22 @@ static void _system_setting_get_ringtone_list_cb(int key,
                free(pNode->media_name);
                free(pNode);
        }
+       return true;
 }
-#endif
 
 void setting_ringtone_append_user_ringtones(SettingRingtoneData *ad)
 {
-/*     int ret = 0; */
+       int ret = 0;
        ad->user_files_count = 0;
 
-#if 0
-       ret = system_settings_list_value_string(
-                               SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
-                               _system_setting_get_ringtone_list_cb, ad);
+       ret = system_settings_foreach_value_string(
+                       SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
+                       _system_setting_get_ringtone_list_cb,
+                       ad);
 
        if (ret != 0)
                SETTING_TRACE_ERROR("Failed to get filelist, ret = %s %s",
                                get_error_message(ret), RINGTONE_DIR_PATH);
-#endif
 
 }
 

diff --git a/setting-ringtone/src/setting-ringtone-remove.c b/setting-ringtone/src/setting-ringtone-remove.c
index ebf19bca2ef147e306ba449fcdd9c097fc993815..4f097ea3b3ffead99f4f24048c1ea6699db9f300 100644 (file)
--- a/setting-ringtone/src/setting-ringtone-remove.c
+++ b/setting-ringtone/src/setting-ringtone-remove.c
@@ -23,6 +23,7 @@
 #include "setting-ringtone-main.h"
 #include "setting-ringtone-util.h"
 #include "setting-common-draw-widget.h"
+#include <system_settings.h>
 
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);
@@ -37,6 +38,7 @@ static void _check_all_cb(void *data, Evas_Object * obj,
                void *event_info);
 static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
 
+extern setting_view setting_view_ringtone_main;
 
 setting_view view_setting_ringtone_delete = {
        .create = _view_create,
@@ -274,6 +276,7 @@ static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it)
        SettingRingtoneData *ad = (SettingRingtoneData *)data;
        retv_if(!ad, EINA_FALSE);
        setting_view_destroy(&view_setting_ringtone_delete, ad);
+       setting_view_update(&setting_view_ringtone_main, ad);
        return EINA_TRUE;
 }
 
@@ -304,13 +307,12 @@ static void _click_softkey_done_cb(void *data, Evas_Object * obj,
                if (elm_check_state_get(gl_item_data->eo_check)) {
                        SETTING_TRACE_DEBUG("Removing %s from user ringtones setting",
                                        gl_item_data->filepath);
-/* TODO: Uncomment when system_settings_del_value_string() function merged
-                       if (system_settings_del_value_string(
+
+                       if (system_settings_delete_value_string(
                                        SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE,
                                        gl_item_data->filepath) != 0)
                                SETTING_TRACE_ERROR("Couldn't remove file %s from user ringtones setting",
                                                gl_item_data->filepath);
-*/
                }
        }