From acef6e61a0a7c43a41576c1b2415c42cec670201 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 18 Feb 2024 20:55:41 +0300 Subject: [PATCH] Check close_flag() first. --- td/telegram/DeviceTokenManager.cpp | 2 +- td/telegram/MessageContent.cpp | 2 +- td/telegram/MessagesManager.cpp | 8 ++++---- td/telegram/NotificationManager.cpp | 2 +- td/telegram/PrivacyManager.cpp | 2 +- td/telegram/TopDialogManager.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/td/telegram/DeviceTokenManager.cpp b/td/telegram/DeviceTokenManager.cpp index a6024312d..b68524ddb 100644 --- a/td/telegram/DeviceTokenManager.cpp +++ b/td/telegram/DeviceTokenManager.cpp @@ -381,7 +381,7 @@ void DeviceTokenManager::dec_sync_cnt() { } void DeviceTokenManager::loop() { - if (sync_cnt_ != 0 || G()->close_flag()) { + if (G()->close_flag() || sync_cnt_ != 0) { return; } for (int32 token_type = 1; token_type < TokenType::Size; token_type++) { diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index f70d20310..6c91468d2 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -5907,7 +5907,7 @@ unique_ptr get_message_content(Td *td, FormattedText message, DialogId owner_dialog_id, int32 message_date, bool is_content_read, UserId via_bot_user_id, MessageSelfDestructType *ttl, bool *disable_web_page_preview, const char *source) { - if (!td->auth_manager_->was_authorized() && !G()->close_flag() && media_ptr != nullptr && + if (!G()->close_flag() && !td->auth_manager_->was_authorized() && media_ptr != nullptr && media_ptr->get_id() != telegram_api::messageMediaEmpty::ID) { LOG(ERROR) << "Receive without authorization from " << source << ": " << to_string(media_ptr); media_ptr = nullptr; diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 7a0498ee9..8ef676cb9 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -23885,7 +23885,7 @@ void MessagesManager::on_message_media_uploaded(DialogId dialog_id, const Messag actor_id(this), &MessagesManager::on_media_message_ready_to_send, dialog_id, message_id, PromiseCreator::lambda([this, dialog_id, input_media = std::move(input_media), file_id, thumbnail_file_id](Result result) mutable { - if (result.is_error() || G()->close_flag()) { + if (G()->close_flag() || result.is_error()) { return; } @@ -23968,7 +23968,7 @@ void MessagesManager::on_secret_message_media_uploaded(DialogId dialog_id, const send_closure_later(actor_id(this), &MessagesManager::on_media_message_ready_to_send, dialog_id, m->message_id, PromiseCreator::lambda([this, dialog_id, secret_input_media = std::move(secret_input_media)]( Result result) mutable { - if (result.is_error() || G()->close_flag()) { + if (G()->close_flag() || result.is_error()) { return; } @@ -24158,7 +24158,7 @@ void MessagesManager::on_upload_message_media_finished(int64 media_album_id, Dia for (auto request_message_id : message_ids) { LOG(INFO) << "Send on_media_message_ready_to_send for " << request_message_id << " in " << dialog_id; auto promise = PromiseCreator::lambda([this, media_album_id](Result result) { - if (result.is_error() || G()->close_flag()) { + if (G()->close_flag() || result.is_error()) { return; } @@ -27891,7 +27891,7 @@ void MessagesManager::remove_message_notifications_by_message_ids(DialogId dialo void MessagesManager::do_remove_message_notification(DialogId dialog_id, bool from_mentions, NotificationId notification_id, vector result) { - if (result.empty() || G()->close_flag()) { + if (G()->close_flag() || result.empty()) { return; } CHECK(result.size() == 1); diff --git a/td/telegram/NotificationManager.cpp b/td/telegram/NotificationManager.cpp index e49f5a997..bf786c18b 100644 --- a/td/telegram/NotificationManager.cpp +++ b/td/telegram/NotificationManager.cpp @@ -166,7 +166,7 @@ void NotificationManager::on_flush_pending_updates_timeout_callback(void *notifi } bool NotificationManager::is_disabled() const { - return !td_->auth_manager_->is_authorized() || td_->auth_manager_->is_bot() || G()->close_flag(); + return G()->close_flag() || !td_->auth_manager_->is_authorized() || td_->auth_manager_->is_bot(); } StringBuilder &operator<<(StringBuilder &string_builder, const NotificationManager::ActiveNotificationsUpdate &update) { diff --git a/td/telegram/PrivacyManager.cpp b/td/telegram/PrivacyManager.cpp index 2b0102e73..0da2084eb 100644 --- a/td/telegram/PrivacyManager.cpp +++ b/td/telegram/PrivacyManager.cpp @@ -208,7 +208,7 @@ void PrivacyManager::do_update_privacy(UserPrivacySetting user_privacy_setting, info.is_synchronized_ = true; if (!(info.rules_ == privacy_rules)) { - if ((from_update || was_synchronized) && !G()->close_flag()) { + if (!G()->close_flag() && (from_update || was_synchronized)) { switch (user_privacy_setting.type()) { case UserPrivacySetting::Type::UserStatus: { send_closure_later(G()->contacts_manager(), &ContactsManager::on_update_online_status_privacy); diff --git a/td/telegram/TopDialogManager.cpp b/td/telegram/TopDialogManager.cpp index 3b61f9852..3ad6a7cc2 100644 --- a/td/telegram/TopDialogManager.cpp +++ b/td/telegram/TopDialogManager.cpp @@ -620,7 +620,7 @@ void TopDialogManager::on_first_sync() { } void TopDialogManager::loop() { - if (td_->auth_manager_->is_bot() || G()->close_flag()) { + if (G()->close_flag() || td_->auth_manager_->is_bot()) { return; }