mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Request, show and require accept for updated ToS.

Browse Source
This commit is contained in:
John Preston
2018-06-03 16:30:40 +03:00
parent c85fd368fe
commit 9ebeddbed8
37 changed files with 898 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_controller.h"
#include "mainwindow.h"
#include "mainwidget.h"
#include "messenger.h"
#include "apiwrap.h"
#include "auth_session.h"
@@ -380,7 +381,8 @@ void System::updateAll() {
}
Manager::DisplayOptions Manager::getNotificationOptions(HistoryItem *item) {
auto hideEverything = (App::passcoded() || Global::ScreenIsLocked());
const auto hideEverything = Messenger::Instance().locked()
|| Global::ScreenIsLocked();
DisplayOptions result;
result.hideNameAndPhoto = hideEverything || (Global::NotifyView() > dbinvShowName);
@@ -395,7 +397,7 @@ void Manager::notificationActivated(PeerId peerId, MsgId msgId) {
auto history = App::history(peerId);
window->showFromTray();
window->reActivateWindow();
if (App::passcoded()) {
if (Messenger::Instance().locked()) {
window->setInnerFocus();
system()->clearAll();
} else {