andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Treat empty notification sound as "default".

Browse Source 
GitOrigin-RevId: bc32890cf3365dc3c46ed93724022efd631ba602
This commit is contained in:
levlam 2019-02-01 15:16:00 +03:00
parent f465b460ca
commit 563a88fde4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/NotificationSettings.cpp
View File

@ -121,12 +121,16 @@ DialogNotificationSettings get_dialog_notification_settings(tl_object_ptr<telegr
bool use_default_sound = (settings->flags_ & telegram_api::peerNotifySettings::SOUND_MASK) == 0; bool use_default_sound = (settings->flags_ & telegram_api::peerNotifySettings::SOUND_MASK) == 0;
bool use_default_show_preview = (settings->flags_ & telegram_api::peerNotifySettings::SHOW_PREVIEWS_MASK) == 0; bool use_default_show_preview = (settings->flags_ & telegram_api::peerNotifySettings::SHOW_PREVIEWS_MASK) == 0;
auto mute_until = use_default_mute_until || settings->mute_until_ <= G()->unix_time() ? 0 : settings->mute_until_; auto mute_until = use_default_mute_until || settings->mute_until_ <= G()->unix_time() ? 0 : settings->mute_until_;
auto sound = std::move(settings->sound_);
if (sound.empty()) {
sound = "default";
}
bool silent_send_message = bool silent_send_message =
(settings->flags_ & telegram_api::peerNotifySettings::SILENT_MASK) == 0 ? false : settings->silent_; (settings->flags_ & telegram_api::peerNotifySettings::SILENT_MASK) == 0 ? false : settings->silent_;
return {use_default_mute_until, return {use_default_mute_until,
mute_until, mute_until,
use_default_sound, use_default_sound,
std::move(settings->sound_), std::move(sound),
use_default_show_preview, use_default_show_preview,
settings->show_previews_, settings->show_previews_,
silent_send_message, silent_send_message,
@ -143,8 +147,10 @@ ScopeNotificationSettings get_scope_notification_settings(tl_object_ptr<telegram
settings->mute_until_ <= G()->unix_time() settings->mute_until_ <= G()->unix_time()
? 0 ? 0
: settings->mute_until_; : settings->mute_until_;
auto sound = auto sound = std::move(settings->sound_);
(settings->flags_ & telegram_api::peerNotifySettings::SOUND_MASK) == 0 ? "default" : std::move(settings->sound_); if (sound.empty()) {
sound = "default";
}
auto show_preview = auto show_preview =
(settings->flags_ & telegram_api::peerNotifySettings::SHOW_PREVIEWS_MASK) == 0 ? false : settings->show_previews_; (settings->flags_ & telegram_api::peerNotifySettings::SHOW_PREVIEWS_MASK) == 0 ? false : settings->show_previews_;
return {mute_until, std::move(sound), show_preview, old_disable_pinned_message_notifications, return {mute_until, std::move(sound), show_preview, old_disable_pinned_message_notifications,