From 1e08fcd6db49b53f81ff00fb76d604c3ce8af70b Mon Sep 17 00:00:00 2001 From: Andrey Klimenko Date: Fri, 9 Dec 2016 16:43:31 +0200 Subject: [PATCH] TSAM-10862 app-side part of the fix Change-Id: I6aa1c6a6b551e7d1e958f7b0679fc2b64fb67338 Signed-off-by: Andrey Klimenko --- src/Settings/Controller/src/SettingsSound.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Settings/Controller/src/SettingsSound.cpp b/src/Settings/Controller/src/SettingsSound.cpp index b5d7e8a6..f31d4359 100644 --- a/src/Settings/Controller/src/SettingsSound.cpp +++ b/src/Settings/Controller/src/SettingsSound.cpp @@ -30,12 +30,14 @@ namespace const char *sRingtoneKeySilent = "silent"; const char *sRingtoneValueSilentShow = "silent show"; const char *sRingtoneKeyDefault = "default"; + const char *sRingtoneIsDefaultFlag = "is_default"; const char *sRingtoneValueDefaultShow = "default show"; const char *sRingtoneAppId = "org.tizen.setting-ringtone"; const char* sRingtoneKeyDrmType = "drm_type"; const char* sRingtoneValueDrmAll = "DRM_ALL"; const char* sRingtoneKeyDomain = "domain"; const char* sRingtoneKeyTitle = "title"; + const char* sTrue = "true"; } SettingsSound::SettingsSound(MsgSettings &settingsHandle) @@ -61,14 +63,16 @@ void SettingsSound::onReply(app_control_h request, app_control_h reply, app_cont int count = 0; app_control_get_extra_data_array(reply, APP_CONTROL_DATA_SELECTED, &ringtones, &count); - if (!ringtones || !ringtones[0]) + char *isDefault = nullptr; + app_control_get_extra_data(reply, sRingtoneIsDefaultFlag, &isDefault); + + if (!ringtones || !ringtones[0] || !isDefault) return; char *ringtone = ringtones[0]; - if (strcmp(ringtone, sRingtoneKeySilent) == 0) m_SettingsHandle.setRingtoneType(MsgSettings::SilentRingtone); - else if (strcmp(ringtone, sRingtoneKeyDefault) == 0) + else if (strcmp(isDefault, sTrue) == 0) m_SettingsHandle.setRingtoneType(MsgSettings::DefaultRingtone); else { @@ -77,9 +81,10 @@ void SettingsSound::onReply(app_control_h request, app_control_h reply, app_cont } for (int i = 0; i < count; ++i) { - free (ringtones[i]); + free(ringtones[i]); } free(ringtones); + free(isDefault); } bool SettingsSound::launch() -- 2.34.1