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

Fix sending notification updates before updateActiveNotifications.

Browse Source 
GitOrigin-RevId: 38eb16545f4d99eb83eb39beef6a8904ae2002c6
This commit is contained in:
levlam 2019-03-31 20:15:49 +03:00
parent fd5c47a831
commit cb8f8c51e2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/NotificationManager.cpp
View File

@ -196,8 +196,6 @@ void NotificationManager::init() {
return; return;
} }
is_inited_ = true;
disable_contact_registered_notifications_ = disable_contact_registered_notifications_ =
G()->shared_config().get_option_boolean("disable_contact_registered_notifications"); G()->shared_config().get_option_boolean("disable_contact_registered_notifications");
auto sync_state = G()->td_db()->get_binlog_pmc()->get(get_is_contact_registered_notifications_synchronized_key()); auto sync_state = G()->td_db()->get_binlog_pmc()->get(get_is_contact_registered_notifications_synchronized_key());
@ -233,8 +231,6 @@ void NotificationManager::init() {
} while (loaded_groups < needed_groups && last_loaded_notification_group_key_.last_notification_date != 0); } while (loaded_groups < needed_groups && last_loaded_notification_group_key_.last_notification_date != 0);
} }
try_send_update_active_notifications();
auto call_notification_group_ids_string = G()->td_db()->get_binlog_pmc()->get("notification_call_group_ids"); auto call_notification_group_ids_string = G()->td_db()->get_binlog_pmc()->get("notification_call_group_ids");
if (!call_notification_group_ids_string.empty()) { if (!call_notification_group_ids_string.empty()) {
call_notification_group_ids_ = transform(full_split(call_notification_group_ids_string, ','), [](Slice str) { call_notification_group_ids_ = transform(full_split(call_notification_group_ids_string, ','), [](Slice str) {
@ -289,6 +285,9 @@ void NotificationManager::init() {
ActorId<NotificationManager> parent_; ActorId<NotificationManager> parent_;
}; };
send_closure(G()->state_manager(), &StateManager::add_callback, make_unique<StateCallback>(actor_id(this))); send_closure(G()->state_manager(), &StateManager::add_callback, make_unique<StateCallback>(actor_id(this)));
is_inited_ = true;
try_send_update_active_notifications();
} }
void NotificationManager::save_announcement_ids() { void NotificationManager::save_announcement_ids() {
@ -910,6 +909,9 @@ NotificationUpdate as_notification_update(const td_api::Update *update) {
} // namespace } // namespace
void NotificationManager::add_update(int32 group_id, td_api::object_ptr<td_api::Update> update) { void NotificationManager::add_update(int32 group_id, td_api::object_ptr<td_api::Update> update) {
if (!is_binlog_processed_ || !is_inited_) {
return;
}
VLOG(notifications) << "Add " << as_notification_update(update.get()); VLOG(notifications) << "Add " << as_notification_update(update.get());
auto &updates = pending_updates_[group_id]; auto &updates = pending_updates_[group_id];
if (updates.empty()) { if (updates.empty()) {
@ -3386,7 +3388,7 @@ td_api::object_ptr<td_api::updateHavePendingNotifications> NotificationManager::
} }
void NotificationManager::send_update_have_pending_notifications() const { void NotificationManager::send_update_have_pending_notifications() const {
if (is_destroyed_) { if (is_destroyed_ || !is_inited_ || !is_binlog_processed_) {
return; return;
} }