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

Add NotificationManager::force_flush_pending_updates,

Browse Source 
GitOrigin-RevId: 4908bb2300613d8231b35093fbcfe87fe4d4b434
This commit is contained in:
levlam 2019-03-31 00:38:18 +03:00
parent ae8310907a
commit bad2ee02a0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
td/telegram/NotificationManager.cpp
View File

@ -1279,6 +1279,11 @@ void NotificationManager::flush_pending_updates(int32 group_id, const char *sour
on_pending_notification_update_count_changed(-1, group_id, "flush_pending_updates"); on_pending_notification_update_count_changed(-1, group_id, "flush_pending_updates");
} }
void NotificationManager::force_flush_pending_updates(NotificationGroupId group_id, const char *source) {
flush_pending_updates_timeout_.cancel_timeout(group_id.get());
flush_pending_updates(group_id.get(), source);
}
void NotificationManager::flush_all_pending_updates(bool include_delayed_chats, const char *source) { void NotificationManager::flush_all_pending_updates(bool include_delayed_chats, const char *source) {
VLOG(notifications) << "Flush all pending notification updates " VLOG(notifications) << "Flush all pending notification updates "
<< (include_delayed_chats ? "with delayed chats " : "") << "from " << source; << (include_delayed_chats ? "with delayed chats " : "") << "from " << source;
@ -1299,8 +1304,7 @@ void NotificationManager::flush_all_pending_updates(bool include_delayed_chats,
VLOG(notifications) << "Flush pending updates in " << ready_group_keys.size() << " notification groups"; VLOG(notifications) << "Flush pending updates in " << ready_group_keys.size() << " notification groups";
std::sort(ready_group_keys.begin(), ready_group_keys.end()); std::sort(ready_group_keys.begin(), ready_group_keys.end());
for (auto group_key : reversed(ready_group_keys)) { for (auto group_key : reversed(ready_group_keys)) {
flush_pending_updates_timeout_.cancel_timeout(group_key.group_id.get()); force_flush_pending_updates(group_key.group_id, "flush_all_pending_updates");
flush_pending_updates(group_key.group_id.get(), "flush_all_pending_updates");
} }
if (include_delayed_chats) { if (include_delayed_chats) {
CHECK(pending_updates_.empty()); CHECK(pending_updates_.empty());
@ -1498,9 +1502,7 @@ void NotificationManager::flush_pending_notifications(NotificationGroupId group_
add_group(std::move(final_group_key), std::move(group)); add_group(std::move(final_group_key), std::move(group));
if (force_update) { if (force_update) {
auto id = group_key.group_id.get(); force_flush_pending_updates(group_key.group_id, "flush_pending_notifications");
flush_pending_updates_timeout_.cancel_timeout(id);
flush_pending_updates(id, "on_notifications_removed");
} }
} }
@ -1626,9 +1628,7 @@ void NotificationManager::on_notifications_removed(
} }
if (force_update) { if (force_update) {
auto id = group_key.group_id.get(); force_flush_pending_updates(group_key.group_id, "on_notifications_removed");
flush_pending_updates_timeout_.cancel_timeout(id);
flush_pending_updates(id, "on_notifications_removed");
} }
if (last_loaded_notification_group_key_ < last_group_key) { if (last_loaded_notification_group_key_ < last_group_key) {
@ -2159,8 +2159,7 @@ void NotificationManager::remove_call_notification(DialogId dialog_id, CallId ca
flush_pending_notifications_timeout_.cancel_timeout(group_id.get()); flush_pending_notifications_timeout_.cancel_timeout(group_id.get());
flush_pending_notifications(group_id); flush_pending_notifications(group_id);
flush_pending_updates_timeout_.cancel_timeout(group_id.get()); force_flush_pending_updates(group_id, "reuse call group_id");
flush_pending_updates(group_id.get(), "reuse call group_id");
auto group_it = get_group(group_id); auto group_it = get_group(group_id);
CHECK(group_it->first.dialog_id == dialog_id); CHECK(group_it->first.dialog_id == dialog_id);
@ -3161,8 +3160,7 @@ void NotificationManager::after_get_chat_difference_impl(NotificationGroupId gro
VLOG(notifications) << "Flush updates after get chat difference in " << group_id; VLOG(notifications) << "Flush updates after get chat difference in " << group_id;
CHECK(group_id.is_valid()); CHECK(group_id.is_valid());
if (!running_get_difference_ && pending_updates_.count(group_id.get()) == 1) { if (!running_get_difference_ && pending_updates_.count(group_id.get()) == 1) {
flush_pending_updates_timeout_.cancel_timeout(group_id.get()); force_flush_pending_updates(group_id, "after_get_chat_difference");
flush_pending_updates(group_id.get(), "after_get_chat_difference");
} }
} }

2
td/telegram/NotificationManager.h
View File

@ -258,6 +258,8 @@ class NotificationManager : public Actor {
void flush_pending_updates(int32 group_id, const char *source); void flush_pending_updates(int32 group_id, const char *source);
void force_flush_pending_updates(NotificationGroupId group_id, const char *source);
void flush_all_pending_updates(bool include_delayed_chats, const char *source); void flush_all_pending_updates(bool include_delayed_chats, const char *source);
NotificationGroupId get_call_notification_group_id(DialogId dialog_id); NotificationGroupId get_call_notification_group_id(DialogId dialog_id);