From 035a19b41e568e0267b231c6e7b16bc9802f958b Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 8 Sep 2020 18:12:16 +0300 Subject: [PATCH] Removed authorizations check form Data::Session. --- Telegram/SourceFiles/api/api_updates.cpp | 3 ++- Telegram/SourceFiles/boxes/sessions_box.cpp | 10 +--------- Telegram/SourceFiles/data/data_session.cpp | 8 -------- Telegram/SourceFiles/data/data_session.h | 4 ---- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp index 06c479050..4322cf935 100644 --- a/Telegram/SourceFiles/api/api_updates.cpp +++ b/Telegram/SourceFiles/api/api_updates.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "api/api_updates.h" +#include "api/api_authorizations.h" #include "api/api_text_entities.h" #include "main/main_session.h" #include "main/main_account.h" @@ -1772,7 +1773,7 @@ void Updates::feedUpdate(const MTPUpdate &update) { } } else { session().data().serviceNotification(text, d.vmedia()); - session().data().checkNewAuthorization(); + session().api().authorizations().reload(); } } break; diff --git a/Telegram/SourceFiles/boxes/sessions_box.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp index c23798706..63e926127 100644 --- a/Telegram/SourceFiles/boxes/sessions_box.cpp +++ b/Telegram/SourceFiles/boxes/sessions_box.cpp @@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/timer.h" #include "base/unixtime.h" #include "boxes/confirm_box.h" -#include "data/data_session.h" #include "lang/lang_keys.h" #include "main/main_session.h" #include "styles/style_boxes.h" @@ -77,7 +76,6 @@ private: void terminateOne(uint64 hash); void terminateAll(); - const not_null _session; const not_null _authorizations; rpl::variable _loading = false; @@ -134,8 +132,7 @@ private: }; SessionsContent::SessionsContent(QWidget*, not_null session) -: _session(session) -, _authorizations(&_session->api().authorizations()) +: _authorizations(&session->api().authorizations()) , _inner(this) , _shortPollTimer([=] { shortPollSessions(); }) { } @@ -159,11 +156,6 @@ void SessionsContent::setupContent() { terminateAll(); }, lifetime()); - _session->data().newAuthorizationChecks( - ) | rpl::start_with_next([=] { - shortPollSessions(); - }, lifetime()); - _loading.changes( ) | rpl::start_with_next([=](bool value) { _inner->setVisible(!value); diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index ec057993f..25c62548b 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -3827,14 +3827,6 @@ void Session::serviceNotification( } } -void Session::checkNewAuthorization() { - _newAuthorizationChecks.fire({}); -} - -rpl::producer<> Session::newAuthorizationChecks() const { - return _newAuthorizationChecks.events(); -} - void Session::insertCheckedServiceNotification( const TextWithEntities &message, const MTPMessageMedia &media, diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h index c95f20a1b..4ac51efcd 100644 --- a/Telegram/SourceFiles/data/data_session.h +++ b/Telegram/SourceFiles/data/data_session.h @@ -626,8 +626,6 @@ public: void serviceNotification( const TextWithEntities &message, const MTPMessageMedia &media = MTP_messageMediaEmpty()); - void checkNewAuthorization(); - rpl::producer<> newAuthorizationChecks() const; void setMimeForwardIds(MessageIdsList &&list); MessageIdsList takeMimeForwardIds(); @@ -924,8 +922,6 @@ private: int>; std::unique_ptr _passportCredentials; - rpl::event_stream<> _newAuthorizationChecks; - rpl::event_stream _sendActionAnimationUpdate; std::vector _wallpapers;