From e66d92f705b3b43211fd42e2518e6a20c8c46f1f Mon Sep 17 00:00:00 2001 From: Andrey Klimenko Date: Tue, 13 Dec 2016 11:35:46 +0200 Subject: [PATCH] TSAM-9601 Fix from message-app side Change-Id: Ica011e5baf9dbe5e43144a1c2ab692a8ded52e62 Signed-off-by: Andrey Klimenko --- src/Settings/Controller/src/SettingsSound.cpp | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/Settings/Controller/src/SettingsSound.cpp b/src/Settings/Controller/src/SettingsSound.cpp index f31d4359..bef4ca02 100644 --- a/src/Settings/Controller/src/SettingsSound.cpp +++ b/src/Settings/Controller/src/SettingsSound.cpp @@ -25,32 +25,24 @@ using namespace Msg; namespace { const char *sRingtoneValuePath = "/opt/share/settings/Alerts"; - const char *sRingtoneKeyFileType = "file_type"; - const char *sRingtoneValueSound = "SOUND"; 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"; + const char *sRingtoneValueTrue = "true"; + const char *sRingtoneKeyDefaultSubstitution = "default_substitution"; + const char *sDefaultAlert = "General notification_sdk.wav"; } SettingsSound::SettingsSound(MsgSettings &settingsHandle) : m_SettingsHandle(settingsHandle) { app_control_set_app_id(m_Handle, sRingtoneAppId); - app_control_add_extra_data(m_Handle, APP_CONTROL_DATA_PATH, sRingtoneValuePath); - app_control_add_extra_data(m_Handle, sRingtoneKeyDomain, PACKAGE_NAME); - app_control_add_extra_data(m_Handle, sRingtoneKeyFileType, sRingtoneValueSound); - app_control_add_extra_data(m_Handle, sRingtoneKeySilent, sRingtoneValueSilentShow); - app_control_add_extra_data(m_Handle, sRingtoneKeyDefault, sRingtoneValueDefaultShow); - app_control_add_extra_data(m_Handle, sRingtoneKeyDrmType, sRingtoneValueDrmAll); - app_control_add_extra_data(m_Handle, sRingtoneKeyTitle, msg("IDS_MSG_HEADER_MESSAGE_TONE_ABB").get()); + app_control_add_extra_data_array(m_Handle, APP_CONTROL_DATA_PATH, &sRingtoneValuePath, 1); + app_control_add_extra_data_array(m_Handle, APP_CONTROL_DATA_SELECTED, &sRingtoneValuePath, 1); + + std::string defaultRingtonePath = sRingtoneValuePath + std::string("/") + sDefaultAlert; + app_control_add_extra_data(m_Handle, sRingtoneKeyDefaultSubstitution, defaultRingtonePath.c_str()); } SettingsSound::~SettingsSound() @@ -72,7 +64,7 @@ void SettingsSound::onReply(app_control_h request, app_control_h reply, app_cont char *ringtone = ringtones[0]; if (strcmp(ringtone, sRingtoneKeySilent) == 0) m_SettingsHandle.setRingtoneType(MsgSettings::SilentRingtone); - else if (strcmp(isDefault, sTrue) == 0) + else if (strcmp(isDefault, sRingtoneValueTrue) == 0) m_SettingsHandle.setRingtoneType(MsgSettings::DefaultRingtone); else { @@ -90,6 +82,7 @@ void SettingsSound::onReply(app_control_h request, app_control_h reply, app_cont bool SettingsSound::launch() { std::string selectedData; + if (m_SettingsHandle.getRingtoneType() == MsgSettings::SilentRingtone) selectedData = sRingtoneKeySilent; else if (m_SettingsHandle.getRingtoneType() == MsgSettings::DefaultRingtone) -- 2.34.1