diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 04523578..7e35044a 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -1648,3 +1648,11 @@ ChatPage::isRoomActive(const QString &room_id) return QGuiApplication::focusWindow() && QGuiApplication::focusWindow()->isActive() && MainWindow::instance()->windowForRoom(room_id) == QGuiApplication::focusWindow(); } + +void +ChatPage::removeAllNotifications() +{ +#if defined (Q_OS_LINUX) + notificationsManager->closeAllNotifications(); +#endif +} diff --git a/src/ChatPage.h b/src/ChatPage.h index 0ac39faa..ffe70496 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -84,6 +84,8 @@ public: return pushrules; } + void removeAllNotifications(); + public slots: bool handleMatrixUri(QString uri); bool handleMatrixUri(const QUrl &uri); diff --git a/src/main.cpp b/src/main.cpp index 779c7800..1ecb014d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -350,6 +350,7 @@ main(int argc, char *argv[]) w.show(); QObject::connect(&app, &QApplication::aboutToQuit, &w, [&w]() { + ChatPage::instance()->removeAllNotifications(); w.saveCurrentWindowSize(); if (http::client() != nullptr) { nhlog::net()->debug("shutting down all I/O threads & open connections"); diff --git a/src/notifications/Manager.h b/src/notifications/Manager.h index bf7af29b..70a03345 100644 --- a/src/notifications/Manager.h +++ b/src/notifications/Manager.h @@ -55,6 +55,9 @@ public slots: #if defined(NHEKO_DBUS_SYS) public: void closeNotifications(QString roomId); +#if defined(Q_OS_LINUX) + void closeAllNotifications(); +#endif private: QDBusInterface dbus; diff --git a/src/notifications/ManagerLinux.cpp b/src/notifications/ManagerLinux.cpp index 294df4db..c694d88f 100644 --- a/src/notifications/ManagerLinux.cpp +++ b/src/notifications/ManagerLinux.cpp @@ -271,3 +271,12 @@ NotificationsManager::notificationClosed(uint id, uint reason) Q_UNUSED(reason); notificationIds.remove(id); } + +void +NotificationsManager::closeAllNotifications() +{ + for (auto id : notificationIds.keys()) { + closeNotification(id); + notificationIds.remove(id); + } +}