Iteration

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 682b8a393a72760e9fdfeafca7d564526410e881..b048b329b011267e4c947d049bd0669ae5021759 100644 (file)
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -415,14 +415,13 @@ void User::slotAddError(const QString &folderAlias, const QString &message, Erro
 
 bool User::isValueableActivity(const Folder *folder, const SyncFileItemPtr &item) const
 {
-    // Check if we are adding it to the right account and if it is useful information (protocol errors)
-    const auto isDifferentAccount = folder->accountState() != _account.data();
-    const auto isConflictFromOriginalFile = item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file);
-
-    if (isDifferentAccount) {
+    // Ignore activity from a different account
+    if (folder->accountState() != _account.data()) {
         return false;
     }
-    if (isConflictFromOriginalFile) {
+
+    // We just care about conflict issues that we are able to resolve
+    if (item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file)) {
         return false;
     }