Rename isActivityIgnored() to isUnsolvableconflict()

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

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 9763a79d092e562810af00368f40e84f5950498a..8a1233be7928cd9bf88736914046518f3c374cc0 100644 (file)
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -418,14 +418,10 @@ bool User::isActivityOfCurrentAccount(const Folder *folder) const
     return folder->accountState() == _account.data();
 }
 
-bool User::isActivityIgnored(const SyncFileItemPtr &item) const
+bool User::isUnsolvableConflict(const SyncFileItemPtr &item) const
 {
     // We just care about conflict issues that we are able to resolve
-    if (item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file)) {
-        return true;
-    }
-
-    return false;
+    return item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file);
 }
 
 void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
@@ -439,7 +435,7 @@ void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
         return;
     }
 
-    if (isActivityIgnored(item)) {
+    if (isUnsolvableConflict(item)) {
         return;
     }
 

diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h
index be92e8aecc7d3777953a601b3a294fd2f7fbb49d..6302d134072433c4713f38f023c20d7f5ef3b034 100644 (file)
--- a/src/gui/tray/UserModel.h
+++ b/src/gui/tray/UserModel.h
@@ -81,7 +81,7 @@ private:
     bool checkPushNotificationsAreReady() const;
 
     bool isActivityOfCurrentAccount(const Folder *folder) const;
-    bool isActivityIgnored(const SyncFileItemPtr &item) const;
+    bool isUnsolvableConflict(const SyncFileItemPtr &item) const;
 
 private:
     AccountStatePtr _account;