void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-08 08:04:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix clearing session notifications.

Browse source
This commit is contained in:
John Preston 2020-06-30 11:52:59 +04:00
parent c3fa300b5c
commit 613a2f358a
3 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View file

@ -582,7 +582,9 @@ void Manager::Private::showNotification(
const QString &msg, const QString &msg,
bool hideNameAndPhoto, bool hideNameAndPhoto,
bool hideReplyButton) { bool hideReplyButton) {
if (!Supported()) return; if (!Supported()) {
return;
}
const auto key = FullPeer{ const auto key = FullPeer{
.sessionId = peer->session().uniqueId(), .sessionId = peer->session().uniqueId(),
@ -630,7 +632,9 @@ void Manager::Private::showNotification(
} }
void Manager::Private::clearAll() { void Manager::Private::clearAll() {
if (!Supported()) return; if (!Supported()) {
return;
}
for (const auto &[key, notifications] : base::take(_notifications)) { for (const auto &[key, notifications] : base::take(_notifications)) {
for (const auto &[msgId, notification] : notifications) { for (const auto &[msgId, notification] : notifications) {
@ -640,7 +644,9 @@ void Manager::Private::clearAll() {
} }
void Manager::Private::clearFromHistory(not_null<History*> history) { void Manager::Private::clearFromHistory(not_null<History*> history) {
if (!Supported()) return; if (!Supported()) {
return;
}
const auto key = FullPeer{ const auto key = FullPeer{
.sessionId = history->session().uniqueId(), .sessionId = history->session().uniqueId(),
@ -658,11 +664,16 @@ void Manager::Private::clearFromHistory(not_null<History*> history) {
} }
void Manager::Private::clearFromSession(not_null<Main::Session*> session) { void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
if (!Supported()) return; if (!Supported()) {
return;
}
const auto sessionId = session->uniqueId(); const auto sessionId = session->uniqueId();
for (auto i = _notifications.begin(); i != _notifications.end();) { for (auto i = _notifications.begin(); i != _notifications.end();) {
if (i->first.sessionId == sessionId) { if (i->first.sessionId != sessionId) {
++i;
continue;
}
const auto temp = base::take(i->second); const auto temp = base::take(i->second);
i = _notifications.erase(i); i = _notifications.erase(i);
@ -670,11 +681,12 @@ void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
notification->close(); notification->close();
} }
} }
}
} }
void Manager::Private::clearNotification(NotificationId id) { void Manager::Private::clearNotification(NotificationId id) {
if (!Supported()) return; if (!Supported()) {
return;
}
auto i = _notifications.find(id.full); auto i = _notifications.find(id.full);
if (i != _notifications.cend()) { if (i != _notifications.cend()) {

18
Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
View file

@ -415,7 +415,9 @@ Manager::Private::~Private() {
} }
void Manager::Private::clearAll() { void Manager::Private::clearAll() {
if (!_notifier) return; if (!_notifier) {
return;
}
auto temp = base::take(_notifications); auto temp = base::take(_notifications);
for (const auto &[key, notifications] : base::take(_notifications)) { for (const auto &[key, notifications] : base::take(_notifications)) {
@ -426,7 +428,9 @@ void Manager::Private::clearAll() {
} }
void Manager::Private::clearFromHistory(not_null<History*> history) { void Manager::Private::clearFromHistory(not_null<History*> history) {
if (!_notifier) return; if (!_notifier) {
return;
}
auto i = _notifications.find(FullPeer{ auto i = _notifications.find(FullPeer{
.sessionId = history->session().uniqueId(), .sessionId = history->session().uniqueId(),
@ -443,11 +447,16 @@ void Manager::Private::clearFromHistory(not_null<History*> history) {
} }
void Manager::Private::clearFromSession(not_null<Main::Session*> session) { void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
if (!_notifier) return; if (!_notifier) {
return;
}
const auto sessionId = session->uniqueId(); const auto sessionId = session->uniqueId();
for (auto i = _notifications.begin(); i != _notifications.end();) { for (auto i = _notifications.begin(); i != _notifications.end();) {
if (i->first.sessionId == sessionId) { if (i->first.sessionId != sessionId) {
++i;
continue;
}
const auto temp = base::take(i->second); const auto temp = base::take(i->second);
_notifications.erase(i); _notifications.erase(i);
@ -455,7 +464,6 @@ void Manager::Private::clearFromSession(not_null<Main::Session*> session) {
_notifier->Hide(notification.p.Get()); _notifier->Hide(notification.p.Get());
} }
} }
}
} }
void Manager::Private::beforeNotificationActivated(NotificationId id) { void Manager::Private::beforeNotificationActivated(NotificationId id) {

8
Telegram/SourceFiles/window/notifications_manager.cpp
View file

@ -207,15 +207,15 @@ void System::clearFromSession(not_null<Main::Session*> session) {
for (auto i = _whenMaps.begin(); i != _whenMaps.end();) { for (auto i = _whenMaps.begin(); i != _whenMaps.end();) {
const auto history = i->first; const auto history = i->first;
if (&history->session() == session) { if (&history->session() != session) {
++i;
continue;
}
history->clearNotifications(); history->clearNotifications();
i = _whenMaps.erase(i); i = _whenMaps.erase(i);
_whenAlerts.remove(history); _whenAlerts.remove(history);
_waiters.remove(history); _waiters.remove(history);
_settingWaiters.remove(history); _settingWaiters.remove(history);
} else {
++i;
}
} }
const auto clearFrom = [&](auto &map) { const auto clearFrom = [&](auto &map) {
for (auto i = map.begin(); i != map.end();) { for (auto i = map.begin(); i != map.end();) {