tdlight-team/tdlight
tdlight-team
/
tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix detecting of silent push notifications. 

GitOrigin-RevId: 3fb75cf469bc0a069c0d34c82b02d2c629e64724
This commit is contained in:
levlam 2019-04-13 23:09:42 +03:00
parent 2585f5efae
commit 67c9d568ae
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/NotificationManager.cpp
View File

@ -2892,7 +2892,6 @@ Status NotificationManager::process_push_notification_payload(string payload, Pr
string announcement_message_text;
vector<string> loc_args;
string sender_name;
bool is_silent = false;
for (auto &field_value : data) {
if (field_value.first == "loc_key") {
if (field_value.second.type() != JsonValue::Type::String) {
@ -2926,11 +2925,6 @@ Status NotificationManager::process_push_notification_payload(string payload, Pr
if (sent_date - 28 * 86400 <= google_sent_time && google_sent_time <= sent_date + 5) {
sent_date = narrow_cast<int32>(google_sent_time);
}
} else if (field_value.first == "silent" && field_value.second.type() != JsonValue::Type::Null) {
if (field_value.second.type() != JsonValue::Type::String) {
return Status::Error("Expected silent flag as a String");
}
is_silent = !field_value.second.get_string().empty();
}
}
@ -3311,6 +3305,7 @@ Status NotificationManager::process_push_notification_payload(string payload, Pr
std::move(arg), std::move(attached_photo), std::move(attached_document), 0,
std::move(promise));
} else {
bool is_silent = has_json_object_field(custom, "silent");
add_message_push_notification(dialog_id, MessageId(server_message_id), random_id, sender_user_id,
std::move(sender_name), sent_date, contains_mention, is_silent, std::move(loc_key),
std::move(arg), std::move(attached_photo), std::move(attached_document),