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

Flush all pending notifications on closing.

Browse Source 
GitOrigin-RevId: 52bd202389a98e4df9ca7a1e359270aeaa568b0e
This commit is contained in:
levlam 2018-12-24 05:53:24 +03:00
parent 6d0ceb9c1b
commit e0b5189f70
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/NotificationManager.cpp
View File

@ -1024,6 +1024,8 @@ void NotificationManager::flush_pending_updates(int32 group_id, const char *sour
} }
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 "
<< (include_delayed_chats ? "with delayed chats " : "") << "from " << source;
vector<NotificationGroupKey> ready_group_keys; vector<NotificationGroupKey> ready_group_keys;
for (auto &it : pending_updates_) { for (auto &it : pending_updates_) {
if (include_delayed_chats || running_get_chat_difference_.count(it.first) == 0) { if (include_delayed_chats || running_get_chat_difference_.count(it.first) == 0) {
@ -1034,6 +1036,7 @@ void NotificationManager::flush_all_pending_updates(bool include_delayed_chats,
} }
// flush groups in reverse order to not exceed max_notification_group_count_ // flush groups in reverse order to not exceed max_notification_group_count_
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()); flush_pending_updates_timeout_.cancel_timeout(group_key.group_id.get());
@ -1233,6 +1236,7 @@ void NotificationManager::flush_all_pending_notifications() {
} }
// flush groups in order of last notification date // flush groups in order of last notification date
VLOG(notifications) << "Flush pending notifications in " << group_ids.size() << " notification groups";
for (auto &it : group_ids) { for (auto &it : group_ids) {
flush_pending_notifications_timeout_.cancel_timeout(it.second.get()); flush_pending_notifications_timeout_.cancel_timeout(it.second.get());
flush_pending_notifications(it.second); flush_pending_notifications(it.second);
@ -1720,8 +1724,7 @@ void NotificationManager::on_notification_group_count_max_changed(bool send_upda
bool is_increased = new_max_notification_group_count_size_t > max_notification_group_count_; bool is_increased = new_max_notification_group_count_size_t > max_notification_group_count_;
if (send_updates) { if (send_updates) {
flush_all_pending_notifications(); flush_all_notifications();
flush_all_pending_updates(true, "on_notification_group_size_max_changed begin");
size_t cur_pos = 0; size_t cur_pos = 0;
size_t min_group_count = min(new_max_notification_group_count_size_t, max_notification_group_count_); size_t min_group_count = min(new_max_notification_group_count_size_t, max_notification_group_count_);
@ -1787,8 +1790,7 @@ void NotificationManager::on_notification_group_size_max_changed() {
<< new_max_notification_group_size; << new_max_notification_group_size;
if (max_notification_group_size_ != 0) { if (max_notification_group_size_ != 0) {
flush_all_pending_notifications(); flush_all_notifications();
flush_all_pending_updates(true, "on_notification_group_size_max_changed");
size_t left = max_notification_group_count_; size_t left = max_notification_group_count_;
for (auto it = groups_.begin(); it != groups_.end() && left > 0; ++it, left--) { for (auto it = groups_.begin(); it != groups_.end() && left > 0; ++it, left--) {
@ -1945,6 +1947,11 @@ void NotificationManager::get_current_state(vector<td_api::object_ptr<td_api::Up
} }
} }
void NotificationManager::flush_all_notifications() {
flush_all_pending_notifications();
flush_all_pending_updates(true, "flush_all_notifications");
}
void NotificationManager::destroy_all_notifications() { void NotificationManager::destroy_all_notifications() {
if (is_destroyed_) { if (is_destroyed_) {
return; return;

2
td/telegram/NotificationManager.h
View File

@ -97,6 +97,8 @@ class NotificationManager : public Actor {
void get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates) const; void get_current_state(vector<td_api::object_ptr<td_api::Update>> &updates) const;
void flush_all_notifications();
void destroy_all_notifications(); void destroy_all_notifications();
private: private:

2
td/telegram/Td.cpp
View File

@ -3802,6 +3802,8 @@ void Td::clear() {
} }
} }
notification_manager_->destroy_all_notifications(); notification_manager_->destroy_all_notifications();
} else {
notification_manager_->flush_all_notifications();
} }
LOG(DEBUG) << "Options was cleared " << timer; LOG(DEBUG) << "Options was cleared " << timer;