From: Felix Weilbach <felix.weilbach@nextcloud.com>
Date: Fri, 5 Mar 2021 10:01:32 +0000 (+0100)
Subject: Iteration
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~339^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=63dbb90bbd96d3169b6186fb7a37edddf3f00d3e;p=nextcloud-desktop.git

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 682b8a393..b048b329b 100644
--- 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;
     }