From b4b56aec4baabe89a331fd1ed8937e71cdf0908d Mon Sep 17 00:00:00 2001 From: ababi Date: Mon, 12 Oct 2020 11:00:03 +0200 Subject: [PATCH] notifications: avoid unnecessary account and conversation check - notifications were not shown when last notification received was from the same account and conversation Gitlab: #142 Change-Id: I7d66199384c2af72b7668bd07d85be0c6bebb3e9 --- src/globalsystemtray.h | 3 --- src/utils.cpp | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/src/globalsystemtray.h b/src/globalsystemtray.h index e3853306..2979a657 100644 --- a/src/globalsystemtray.h +++ b/src/globalsystemtray.h @@ -34,9 +34,6 @@ public: return *instance_; } - inline static QString notificationAccountId {}; - inline static QString notificationConvUid {}; - template static void connectClicked(Func&& onClicked) { diff --git a/src/utils.cpp b/src/utils.cpp index 858f44be..b215d236 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -297,18 +297,8 @@ Utils::showNotification(const QString& message, return; } - if (accountId == GlobalSystemTray::notificationAccountId - && convUid == GlobalSystemTray::notificationConvUid) { - GlobalSystemTray::notificationAccountId.clear(); - GlobalSystemTray::notificationConvUid.clear(); - return; - } - GlobalSystemTray::connectClicked(std::move(onClicked)); - GlobalSystemTray::notificationAccountId = accountId; - GlobalSystemTray::notificationConvUid = convUid; - if (from.isEmpty()) GlobalSystemTray::instance().showMessage(message, "", QIcon(":images/jami.png")); else