From cb8f8c51e2d38fca5e640e876543f5f7557ee67c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 31 Mar 2019 20:15:49 +0300
Subject: [PATCH] Fix sending notification updates before
 updateActiveNotifications.

GitOrigin-RevId: 38eb16545f4d99eb83eb39beef6a8904ae2002c6
---
 td/telegram/NotificationManager.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp
index 73d39eec..c4f571e0 100644
--- a/td/telegram/NotificationManager.cpp
+++ b/td/telegram/NotificationManager.cpp
@@ -196,8 +196,6 @@ void NotificationManager::init() {
     return;
   }
 
-  is_inited_ = true;
-
   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());
@@ -233,8 +231,6 @@ void NotificationManager::init() {
     } 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");
   if (!call_notification_group_ids_string.empty()) {
     call_notification_group_ids_ = transform(full_split(call_notification_group_ids_string, ','), [](Slice str) {
@@ -289,6 +285,9 @@ void NotificationManager::init() {
     ActorId<NotificationManager> parent_;
   };
   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() {
@@ -910,6 +909,9 @@ NotificationUpdate as_notification_update(const td_api::Update *update) {
 }  // namespace
 
 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());
   auto &updates = pending_updates_[group_id];
   if (updates.empty()) {
@@ -3386,7 +3388,7 @@ td_api::object_ptr<td_api::updateHavePendingNotifications> NotificationManager::
 }
 
 void NotificationManager::send_update_have_pending_notifications() const {
-  if (is_destroyed_) {
+  if (is_destroyed_ || !is_inited_ || !is_binlog_processed_) {
     return;
   }