Skip to content
Snippets Groups Projects
Commit cea56600 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

account: reset default ringtone path if empty


Change-Id: I477699c13343512830f82289bdef331f37282cff
Reviewed-by: default avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 68cb0987
No related branches found
No related tags found
No related merge requests found
...@@ -86,6 +86,12 @@ const char * const Account::HAS_CUSTOM_USER_AGENT_KEY = "hasCustomUserAgent" ...@@ -86,6 +86,12 @@ const char * const Account::HAS_CUSTOM_USER_AGENT_KEY = "hasCustomUserAgent"
const char * const Account::PRESENCE_MODULE_ENABLED_KEY = "presenceModuleEnabled"; const char * const Account::PRESENCE_MODULE_ENABLED_KEY = "presenceModuleEnabled";
const char * const Account::UPNP_ENABLED_KEY = "upnpEnabled"; const char * const Account::UPNP_ENABLED_KEY = "upnpEnabled";
#ifdef __ANDROID__
constexpr char * const DEFAULT_RINGTONE_PATH = "/data/data/cx.ring/files/ringtones/default.wav";
#else
constexpr char * const DEFAULT_RINGTONE_PATH = "/usr/share/ring/ringtones/default.wav";
#endif
Account::Account(const std::string &accountID) Account::Account(const std::string &accountID)
: accountID_(accountID) : accountID_(accountID)
, username_() , username_()
...@@ -109,11 +115,7 @@ Account::Account(const std::string &accountID) ...@@ -109,11 +115,7 @@ Account::Account(const std::string &accountID)
// Initialize the codec order, used when creating a new account // Initialize the codec order, used when creating a new account
loadDefaultCodecs(); loadDefaultCodecs();
#ifdef __ANDROID__ ringtonePath_ = DEFAULT_RINGTONE_PATH;
ringtonePath_ = "/data/data/cx.ring/files/ringtones/default.wav";
#else
ringtonePath_ = "/usr/share/ring/ringtones/default.wav";
#endif
} }
Account::~Account() Account::~Account()
...@@ -254,6 +256,9 @@ Account::unserialize(const YAML::Node& node) ...@@ -254,6 +256,9 @@ Account::unserialize(const YAML::Node& node)
parseValue(node, USER_AGENT_KEY, userAgent_); parseValue(node, USER_AGENT_KEY, userAgent_);
parseValue(node, RINGTONE_PATH_KEY, ringtonePath_); parseValue(node, RINGTONE_PATH_KEY, ringtonePath_);
parseValue(node, RINGTONE_ENABLED_KEY, ringtoneEnabled_); parseValue(node, RINGTONE_ENABLED_KEY, ringtoneEnabled_);
if (ringtonePath_.empty()) {
ringtonePath_ = DEFAULT_RINGTONE_PATH;
}
bool enabled; bool enabled;
parseValue(node, UPNP_ENABLED_KEY, enabled); parseValue(node, UPNP_ENABLED_KEY, enabled);
...@@ -274,6 +279,9 @@ Account::setAccountDetails(const std::map<std::string, std::string> &details) ...@@ -274,6 +279,9 @@ Account::setAccountDetails(const std::map<std::string, std::string> &details)
parseInt(details, DRing::Account::ConfProperties::ACTIVE_CALL_LIMIT, activeCallLimit_); parseInt(details, DRing::Account::ConfProperties::ACTIVE_CALL_LIMIT, activeCallLimit_);
parseBool(details, Conf::CONFIG_RINGTONE_ENABLED, ringtoneEnabled_); parseBool(details, Conf::CONFIG_RINGTONE_ENABLED, ringtoneEnabled_);
parseString(details, Conf::CONFIG_RINGTONE_PATH, ringtonePath_); parseString(details, Conf::CONFIG_RINGTONE_PATH, ringtonePath_);
if (ringtonePath_.empty()) {
ringtonePath_ = DEFAULT_RINGTONE_PATH;
}
parseBool(details, Conf::CONFIG_ACCOUNT_HAS_CUSTOM_USERAGENT, hasCustomUserAgent_); parseBool(details, Conf::CONFIG_ACCOUNT_HAS_CUSTOM_USERAGENT, hasCustomUserAgent_);
if (hasCustomUserAgent_) if (hasCustomUserAgent_)
parseString(details, Conf::CONFIG_ACCOUNT_USERAGENT, userAgent_); parseString(details, Conf::CONFIG_ACCOUNT_USERAGENT, userAgent_);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment