mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 23:28:14 +03:00
Rename isActivityIgnored() to isUnsolvableconflict()
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
This commit is contained in:
parent
05d31e2e53
commit
e3ac63e9ff
2 changed files with 4 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue