Mirror/jami-client-qt
1
0
Fork 0
mirror of https://github.com/savoirfairelinux/jami-client-qt.git synced 2025-12-19 10:20:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

notifications: avoid unnecessary account and conversation check

Browse Source 
- notifications were not shown when last notification received was from the same account and conversation

Gitlab: #142

Change-Id: I7d66199384c2af72b7668bd07d85be0c6bebb3e9
This commit is contained in:
ababi
2020-10-12 11:00:03 +02:00
committed by Albert Babí Oller
parent ce8783f753
commit b4b56aec4b
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/globalsystemtray.h
View File

@@ -34,9 +34,6 @@ public:
return *instance_; return *instance_;
} }
inline static QString notificationAccountId {};
inline static QString notificationConvUid {};
template<typename Func> template<typename Func>
static void connectClicked(Func&& onClicked) static void connectClicked(Func&& onClicked)
{ {

10
src/utils.cpp
View File

@@ -297,18 +297,8 @@ Utils::showNotification(const QString& message,
return; return;
} }
if (accountId == GlobalSystemTray::notificationAccountId
&& convUid == GlobalSystemTray::notificationConvUid) {
GlobalSystemTray::notificationAccountId.clear();
GlobalSystemTray::notificationConvUid.clear();
return;
}
GlobalSystemTray::connectClicked(std::move(onClicked)); GlobalSystemTray::connectClicked(std::move(onClicked));
GlobalSystemTray::notificationAccountId = accountId;
GlobalSystemTray::notificationConvUid = convUid;
if (from.isEmpty()) if (from.isEmpty())
GlobalSystemTray::instance().showMessage(message, "", QIcon(":images/jami.png")); GlobalSystemTray::instance().showMessage(message, "", QIcon(":images/jami.png"));
else else