From 1ce9f9d27cd3116b6eaccb697980a53c99a70cf8 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 24 Mar 2023 14:14:37 +0300 Subject: [PATCH] Minor improvements. --- td/generate/scheme/td_api.tl | 6 ++++-- td/telegram/DialogFilter.cpp | 1 + td/telegram/DialogFilter.h | 1 + td/telegram/MessagesManager.cpp | 1 - td/telegram/MessagesManager.h | 1 - td/telegram/PollManager.cpp | 6 +++++- td/telegram/Td.cpp | 1 - td/telegram/files/FileDownloader.cpp | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index ec1cef77a..4bc8cdbba 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -89,10 +89,12 @@ emailAddressAuthenticationGoogleId token:string = EmailAddressAuthentication; //@class EmailAddressResetState @description Describes reset state of a email address -//@description Email address can be reset after the given period. Call resetAuthenticationEmailAddress to reset it and allow the user to authorize with a code sent to the user's phone number @wait_period Time required to wait before the email address can be reset; 0 if the user is subscribed to Telegram Premium +//@description Email address can be reset after the given period. Call resetAuthenticationEmailAddress to reset it and allow the user to authorize with a code sent to the user's phone number +//@wait_period Time required to wait before the email address can be reset; 0 if the user is subscribed to Telegram Premium emailAddressResetStateAvailable wait_period:int32 = EmailAddressResetState; -//@description Email address reset has already been requested. Call resetAuthenticationEmailAddress to try to reset it immediately @reset_in Left time before the email address will be reset, in seconds. updateAuthorizationState is not sent when this field changes +//@description Email address reset has already been requested. Call resetAuthenticationEmailAddress to check whether immediate reset is possible +//@reset_in Left time before the email address will be reset, in seconds. updateAuthorizationState is not sent when this field changes emailAddressResetStatePending reset_in:int32 = EmailAddressResetState; diff --git a/td/telegram/DialogFilter.cpp b/td/telegram/DialogFilter.cpp index 6e643cd23..6dab9fde6 100644 --- a/td/telegram/DialogFilter.cpp +++ b/td/telegram/DialogFilter.cpp @@ -20,6 +20,7 @@ #include "td/utils/logging.h" #include "td/utils/misc.h" +#include #include namespace td { diff --git a/td/telegram/DialogFilter.h b/td/telegram/DialogFilter.h index 6081e9e0c..ba6ed7333 100644 --- a/td/telegram/DialogFilter.h +++ b/td/telegram/DialogFilter.h @@ -7,6 +7,7 @@ #pragma once #include "td/telegram/DialogFilterId.h" +#include "td/telegram/DialogId.h" #include "td/telegram/FolderId.h" #include "td/telegram/InputDialogId.h" #include "td/telegram/td_api.h" diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 4e0d4b661..cf38c36b4 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -86,7 +86,6 @@ #include "td/utils/utf8.h" #include -#include #include #include #include diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index a21cc606e..02c323339 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -25,7 +25,6 @@ #include "td/telegram/files/FileSourceId.h" #include "td/telegram/FolderId.h" #include "td/telegram/FullMessageId.h" -#include "td/telegram/Global.h" #include "td/telegram/InputDialogId.h" #include "td/telegram/InputGroupCallId.h" #include "td/telegram/logevent/LogEventHelper.h" diff --git a/td/telegram/PollManager.cpp b/td/telegram/PollManager.cpp index c2056d8c4..e579c65b2 100644 --- a/td/telegram/PollManager.cpp +++ b/td/telegram/PollManager.cpp @@ -14,6 +14,7 @@ #include "td/telegram/DialogId.h" #include "td/telegram/Global.h" #include "td/telegram/logevent/LogEvent.h" +#include "td/telegram/MessageId.h" #include "td/telegram/MessagesManager.h" #include "td/telegram/misc.h" #include "td/telegram/PollId.hpp" @@ -707,7 +708,10 @@ void PollManager::unregister_poll(PollId poll_id, FullMessageId full_message_id, } bool PollManager::can_unload_poll(PollId poll_id) { - if (G()->close_flag() || is_local_poll_id(poll_id) || server_poll_messages_.count(poll_id) != 0 || + if (G()->close_flag()) { + return false; + } + if (is_local_poll_id(poll_id) || server_poll_messages_.count(poll_id) != 0 || other_poll_messages_.count(poll_id) != 0 || pending_answers_.count(poll_id) != 0 || being_closed_polls_.count(poll_id) != 0) { return false; diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index 4489a11b4..35f66101d 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -99,7 +99,6 @@ #include "td/telegram/PasswordManager.h" #include "td/telegram/Payments.h" #include "td/telegram/PhoneNumberManager.h" -#include "td/telegram/Photo.h" #include "td/telegram/PhotoSizeSource.h" #include "td/telegram/PollManager.h" #include "td/telegram/Premium.h" diff --git a/td/telegram/files/FileDownloader.cpp b/td/telegram/files/FileDownloader.cpp index de1915294..866c714ca 100644 --- a/td/telegram/files/FileDownloader.cpp +++ b/td/telegram/files/FileDownloader.cpp @@ -74,7 +74,7 @@ Result FileDownloader::init() { auto result_fd = FileFd::open(path_, FileFd::Write | FileFd::Read); // TODO: check timestamps.. if (result_fd.is_ok()) { - if ((!encryption_key_.is_secret() || partial.iv_.size() == 32) && 0 <= partial.part_size_ && + if ((!encryption_key_.is_secret() || partial.iv_.size() == 32) && partial.part_size_ >= 0 && partial.part_size_ <= (1 << 20) && (partial.part_size_ & (partial.part_size_ - 1)) == 0) { bitmask = Bitmask(Bitmask::Decode{}, partial.ready_bitmask_); if (encryption_key_.is_secret()) {