From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 5 Jul 2023 18:24:10 +0000 (+0800)
Subject: Prevent double notification of folder now big in activities
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~57^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2535d6ce819c02afd2af5bd7259b8511054ba53;p=nextcloud-desktop.git

Prevent double notification of folder now big in activities

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index dd246f109..205ab534f 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1294,6 +1294,7 @@ void Folder::slotExistingFolderNowBig(const QString &folderPath)
         existingFolderNowBigActivity._accName = _accountState->account()->displayName();
         existingFolderNowBigActivity._folder = alias();
         existingFolderNowBigActivity._links = {blacklistActivityLink, whitelistActivityLink};
+        existingFolderNowBigActivity._id = qHash(existingFolderNowBigActivity._file);
 
         const auto user = UserModel::instance()->findUserForAccount(_accountState.data());
         user->slotAddNotification(this, existingFolderNowBigActivity);
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
index 926a159c6..896ff85e4 100644
--- a/src/gui/tray/usermodel.cpp
+++ b/src/gui/tray/usermodel.cpp
@@ -735,10 +735,11 @@ void User::slotAddErrorToGui(const QString &folderAlias, const SyncFileItem::Sta
 
 void User::slotAddNotification(const Folder *folder, const Activity &activity)
 {
-    if (!isActivityOfCurrentAccount(folder)) {
+    if (!isActivityOfCurrentAccount(folder) || _notifiedNotifications.contains(activity._id)) {
         return;
     }
 
+    _notifiedNotifications.insert(activity._id);
     _activityModel->addNotificationToActivityList(activity);
 }