[DC-71] Remove unused capability "upload conflict files" #12369
Conversation
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
|
For review: please check that the logic of |
erikjv
force-pushed
the
work/remove-upload-conflict-files
branch
from
4afaf62 to
f74780d
Compare
| QVERIFY(!fakeFolder.syncJournal().conflictRecord("A/a2").isValid()); | ||
| } | ||
|
|
||
| // Same test, but with uploadConflictFiles == false |
There was a problem hiding this comment.
comment no longer reasonable
|
|
||
| bool Capabilities::uploadConflictFiles() const | ||
| { | ||
| static auto envIsSet = !qEnvironmentVariableIsEmpty("OWNCLOUD_UPLOAD_CONFLICT_FILES"); |
There was a problem hiding this comment.
Is this documentation relevant? Please check with @mmattel or search in the docs repos - THX
There was a problem hiding this comment.
It is mentioned in the docs: https://doc.owncloud.com/desktop/6.0/conflicts.html#force-uploading-conflicted-files
Do we still drop this "unused" capability/feature?
| const bool isConflict = _item->instruction() == CSYNC_INSTRUCTION_CONFLICT && QFileInfo(fsPath).isDir(); | ||
| if (isConflict) { | ||
| QString error; | ||
| if (!propagator()->createConflict(_item, _associatedComposite, &error)) { |
There was a problem hiding this comment.
unless I miss anything - _associatedComposite can be removed including the setter and any caller ...
No description provided.