From de7c886008ce4c5c14fc770f9f5e1dfad43e8e65 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 15 Apr 2017 21:48:54 +0300 Subject: [PATCH] Move passcode management from MainWindow. Check for auto lock in AuthSession. Don't autolock while video plays. Closes #3219 --- Telegram/SourceFiles/auth_session.cpp | 39 ++++++++++++++++++- Telegram/SourceFiles/auth_session.h | 15 ++++++- Telegram/SourceFiles/boxes/autolock_box.cpp | 2 +- Telegram/SourceFiles/boxes/passcode_box.cpp | 2 +- Telegram/SourceFiles/dialogswidget.cpp | 3 +- Telegram/SourceFiles/mainwidget.cpp | 6 +-- Telegram/SourceFiles/mainwindow.cpp | 35 +---------------- Telegram/SourceFiles/mainwindow.h | 6 --- Telegram/SourceFiles/mediaview.cpp | 2 + Telegram/SourceFiles/messenger.cpp | 13 ++++++- Telegram/SourceFiles/messenger.h | 6 +++ Telegram/SourceFiles/passcodewidget.cpp | 3 +- .../platform/win/windows_event_filter.cpp | 5 ++- Telegram/SourceFiles/shortcuts.cpp | 3 +- 14 files changed, 88 insertions(+), 52 deletions(-) diff --git a/Telegram/SourceFiles/auth_session.cpp b/Telegram/SourceFiles/auth_session.cpp index 70d5a84bf..5c446e669 100644 --- a/Telegram/SourceFiles/auth_session.cpp +++ b/Telegram/SourceFiles/auth_session.cpp @@ -25,6 +25,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/file_download.h" #include "storage/localstorage.h" #include "window/notifications_manager.h" +#include "platform/platform_specific.h" + +namespace { + +constexpr auto kAutoLockTimeoutLateMs = TimeMs(3000); + +} // namespace QByteArray AuthSessionData::serialize() const { auto size = sizeof(qint32) * 2; @@ -85,11 +92,16 @@ AuthSession::AuthSession(UserId userId) : _userId(userId) , _api(std::make_unique()) , _downloader(std::make_unique()) -, _notifications(std::make_unique(this)) { +, _notifications(std::make_unique(this)) +, _autoLockTimer([this] { checkAutoLock(); }) { Expects(_userId != 0); _saveDataTimer.setCallback([this] { Local::writeUserSettings(); }); + subscribe(Messenger::Instance().passcodedChanged(), [this] { + _shouldLockAt = 0; + notifications().updateAll(); + }); } bool AuthSession::Exists() { @@ -127,4 +139,29 @@ void AuthSession::saveDataDelayed(TimeMs delay) { _saveDataTimer.callOnce(delay); } +void AuthSession::checkAutoLock() { + if (!Global::LocalPasscode() || App::passcoded()) return; + + Messenger::Instance().checkLocalTime(); + auto now = getms(true); + auto shouldLockInMs = Global::AutoLock() * 1000LL; + auto idleForMs = psIdleTime(); + auto notPlayingVideoForMs = now - data().lastTimeVideoPlayedAt(); + auto checkTimeMs = qMin(idleForMs, notPlayingVideoForMs); + if (checkTimeMs >= shouldLockInMs || (_shouldLockAt > 0 && now > _shouldLockAt + kAutoLockTimeoutLateMs)) { + Messenger::Instance().setupPasscode(); + } else { + _shouldLockAt = now + (shouldLockInMs - checkTimeMs); + _autoLockTimer.callOnce(shouldLockInMs - checkTimeMs); + } +} + +void AuthSession::checkAutoLockIn(TimeMs time) { + if (_autoLockTimer.isActive()) { + auto remain = _autoLockTimer.remainingTime(); + if (remain > 0 && remain <= time) return; + } + _autoLockTimer.callOnce(time); +} + AuthSession::~AuthSession() = default; diff --git a/Telegram/SourceFiles/auth_session.h b/Telegram/SourceFiles/auth_session.h index abd451c75..e8636d7e8 100644 --- a/Telegram/SourceFiles/auth_session.h +++ b/Telegram/SourceFiles/auth_session.h @@ -79,6 +79,12 @@ public: void setTabbedSelectorSectionEnabled(bool enabled) { _variables.tabbedSelectorSectionEnabled = enabled; } + void setLastTimeVideoPlayedAt(TimeMs time) { + _lastTimeVideoPlayedAt = time; + } + TimeMs lastTimeVideoPlayedAt() const { + return _lastTimeVideoPlayedAt; + } private: struct Variables { @@ -92,10 +98,11 @@ private: base::Observable _moreChatsLoaded; base::Observable _savedGifsUpdated; Variables _variables; + TimeMs _lastTimeVideoPlayedAt = 0; }; -class AuthSession final { +class AuthSession final : private base::Subscriber { public: AuthSession(UserId userId); @@ -137,6 +144,9 @@ public: return *_api; } + void checkAutoLock(); + void checkAutoLockIn(TimeMs time); + ~AuthSession(); private: @@ -144,6 +154,9 @@ private: AuthSessionData _data; base::Timer _saveDataTimer; + TimeMs _shouldLockAt = 0; + base::Timer _autoLockTimer; + const std::unique_ptr _api; const std::unique_ptr _downloader; const std::unique_ptr _notifications; diff --git a/Telegram/SourceFiles/boxes/autolock_box.cpp b/Telegram/SourceFiles/boxes/autolock_box.cpp index 2338dea72..f96e3ee8b 100644 --- a/Telegram/SourceFiles/boxes/autolock_box.cpp +++ b/Telegram/SourceFiles/boxes/autolock_box.cpp @@ -52,6 +52,6 @@ void AutoLockBox::durationChanged(int seconds) { Local::writeUserSettings(); Global::RefLocalPasscodeChanged().notify(); - App::wnd()->checkAutoLock(); + AuthSession::Current().checkAutoLock(); closeBox(); } diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index a9a73938c..402bea76f 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -345,7 +345,7 @@ void PasscodeBox::onSave(bool force) { } else { cSetPasscodeBadTries(0); Local::setPasscode(pwd.toUtf8()); - App::wnd()->checkAutoLock(); + AuthSession::Current().checkAutoLock(); closeBox(); } } diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index e97685f94..2461242ad 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -45,6 +45,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "autoupdater.h" #include "observer_peer.h" #include "auth_session.h" +#include "messenger.h" #include "window/notifications_manager.h" #include "ui/effects/widget_fade_wrap.h" #include "window/window_controller.h" @@ -2305,7 +2306,7 @@ DialogsWidget::DialogsWidget(QWidget *parent, gsl::not_null subscribe(Global::RefLocalPasscodeChanged(), [this] { updateLockUnlockVisibility(); }); _lockUnlock->setClickedCallback([this] { _lockUnlock->setIconOverride(&st::dialogsUnlockIcon, &st::dialogsUnlockIconOver); - App::wnd()->setupPasscode(); + Messenger::Instance().setupPasscode(); _lockUnlock->setIconOverride(nullptr); }); _mainMenuToggle->setClickedCallback([this] { showMainMenu(); }); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 114227715..cfd5bd835 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -3501,7 +3501,7 @@ void MainWidget::ptsApplySkippedUpdates() { } void MainWidget::feedDifference(const MTPVector &users, const MTPVector &chats, const MTPVector &msgs, const MTPVector &other) { - App::wnd()->checkAutoLock(); + AuthSession::Current().checkAutoLock(); App::feedUsers(users); App::feedChats(chats); feedMessageIds(other); @@ -4167,7 +4167,7 @@ MainWidget::~MainWidget() { void MainWidget::updateOnline(bool gotOtherOffline) { if (this != App::main()) return; - App::wnd()->checkAutoLock(); + AuthSession::Current().checkAutoLock(); bool isOnline = App::wnd()->isActive(); int updateIn = Global::OnlineUpdatePeriod(); @@ -4262,7 +4262,7 @@ void MainWidget::checkIdleFinish() { void MainWidget::updateReceived(const mtpPrime *from, const mtpPrime *end) { if (end <= from) return; - App::wnd()->checkAutoLock(); + AuthSession::Current().checkAutoLock(); if (mtpTypeId(*from) == mtpc_new_session_created) { try { diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index e41c30c02..59250480f 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -108,13 +108,12 @@ MainWindow::MainWindow() { _inactiveTimer.setSingleShot(true); connect(&_inactiveTimer, SIGNAL(timeout()), this, SLOT(onInactiveTimer())); - connect(&_autoLockTimer, SIGNAL(timeout()), this, SLOT(checkAutoLock())); - subscribe(Global::RefSelfChanged(), [this] { updateGlobalMenu(); }); subscribe(Window::Theme::Background(), [this](const Window::Theme::BackgroundUpdate &data) { themeUpdated(data); }); subscribe(Messenger::Instance().authSessionChanged(), [this] { checkAuthSession(); }); + subscribe(Messenger::Instance().passcodedChanged(), [this] { updateGlobalMenu(); }); checkAuthSession(); setAttribute(Qt::WA_NoSystemBackground); @@ -237,12 +236,8 @@ void MainWindow::clearPasscode() { if (_intro) { _intro->showAnimated(bg, true); } else { + t_assert(_main != nullptr); _main->showAnimated(bg, true); - } - AuthSession::Current().notifications().updateAll(); - updateGlobalMenu(); - - if (_main) { _main->checkStartUrl(); } } @@ -262,32 +257,6 @@ void MainWindow::setupPasscode() { } else { setInnerFocus(); } - _shouldLockAt = 0; - if (AuthSession::Exists()) { - AuthSession::Current().notifications().updateAll(); - } - updateGlobalMenu(); -} - -void MainWindow::checkAutoLockIn(int msec) { - if (_autoLockTimer.isActive()) { - int remain = _autoLockTimer.remainingTime(); - if (remain > 0 && remain <= msec) return; - } - _autoLockTimer.start(msec); -} - -void MainWindow::checkAutoLock() { - if (!Global::LocalPasscode() || App::passcoded()) return; - - App::app()->checkLocalTime(); - auto ms = getms(true), idle = psIdleTime(), should = Global::AutoLock() * 1000LL; - if (idle >= should || (_shouldLockAt > 0 && ms > _shouldLockAt + 3000LL)) { - setupPasscode(); - } else { - _shouldLockAt = ms + (should - idle); - _autoLockTimer.start(should - idle); - } } void MainWindow::setupIntro() { diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 948001f35..736d987c2 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -90,7 +90,6 @@ public: void setupPasscode(); void clearPasscode(); - void checkAutoLockIn(int msec); void setupIntro(); void setupMain(const MTPUser *user = nullptr); void serviceNotification(const TextWithEntities &message, const MTPMessageMedia &media = MTP_messageMediaEmpty(), int32 date = 0, bool force = false); @@ -164,8 +163,6 @@ protected: void updateControlsGeometry() override; public slots: - void checkAutoLock(); - void showSettings(); void layerHidden(); void setInnerFocus(); @@ -238,9 +235,6 @@ private: bool _inactivePress = false; QTimer _inactiveTimer; - SingleTimer _autoLockTimer; - TimeMs _shouldLockAt = 0; - }; class PreLaunchWindow : public TWidget { diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 555aef5c7..0f47eaade 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -1600,6 +1600,8 @@ void MediaView::onVideoPlayProgress(const AudioMsgId &audioId) { if (state.duration) { updateVideoPlaybackState(state); } + + AuthSession::Current().data().setLastTimeVideoPlayedAt(getms(true)); } void MediaView::updateVideoPlaybackState(const Media::Player::TrackState &state) { diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index a3abcf277..6ed2b4a6a 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -129,7 +129,7 @@ Messenger::Messenger() : QObject() DEBUG_LOG(("Application Info: showing.")); if (state == Local::ReadMapPassNeeded) { - _window->setupPasscode(); + setupPasscode(); } else { if (AuthSession::Exists()) { _window->setupMain(); @@ -728,6 +728,17 @@ void Messenger::checkMapVersion() { } } +void Messenger::setupPasscode() { + _window->setupPasscode(); + _passcodedChanged.notify(); +} + +void Messenger::clearPasscode() { + cSetPasscodeBadTries(0); + _window->clearPasscode(); + _passcodedChanged.notify(); +} + void Messenger::prepareToDestroy() { _window.reset(); diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index 171344f8a..152935815 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -113,6 +113,11 @@ public: void checkLocalTime(); void checkMapVersion(); + void setupPasscode(); + void clearPasscode(); + base::Observable &passcodedChanged() { + return _passcodedChanged; + } void handleAppActivated(); void handleAppDeactivated(); @@ -161,5 +166,6 @@ private: std::unique_ptr _mtprotoForKeysDestroy; std::unique_ptr _authSession; base::Observable _authSessionChanged; + base::Observable _passcodedChanged; }; diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp index c173bf83a..361c14364 100644 --- a/Telegram/SourceFiles/passcodewidget.cpp +++ b/Telegram/SourceFiles/passcodewidget.cpp @@ -59,8 +59,7 @@ void PasscodeWidget::onSubmit() { if (App::main()) { if (Local::checkPasscode(_passcode->text().toUtf8())) { - cSetPasscodeBadTries(0); - App::wnd()->clearPasscode(); // Destroys this widget. + Messenger::Instance().clearPasscode(); // Destroys this widget. return; } else { cSetPasscodeBadTries(cPasscodeBadTries() + 1); diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp index 6eb51debb..39b9fad5a 100644 --- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp +++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/win/windows_event_filter.h" #include "mainwindow.h" +#include "auth_session.h" namespace Platform { namespace { @@ -73,7 +74,9 @@ bool EventFilter::mainWindowEvent(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa switch (msg) { case WM_TIMECHANGE: { - App::wnd()->checkAutoLockIn(100); + if (AuthSession::Exists()) { + AuthSession::Current().checkAutoLockIn(100); + } } return false; case WM_WTSSESSION_CHANGE: { diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index e22dd96f7..966b83bf0 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "passcodewidget.h" #include "mainwidget.h" +#include "messenger.h" #include "media/player/media_player_instance.h" #include "platform/platform_specific.h" #include "base/parse_helper.h" @@ -37,7 +38,7 @@ bool lock_telegram() { w->passcodeWidget()->onSubmit(); return true; } else if (Global::LocalPasscode()) { - w->setupPasscode(); + Messenger::Instance().setupPasscode(); return true; } }