Remove unneded changes for conflict handling.

Signed-off-by: alex-z <[email protected]>
nextcloud · May 15, 2024 · 7972c8a · 7972c8a
1 parent f70206a
commit 7972c8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/libsync/bulkpropagatordownloadjob.cpp b/src/libsync/bulkpropagatordownloadjob.cpp
@@ -188,7 +188,7 @@ void BulkPropagatorDownloadJob::startAfterIsEncryptedIsChecked(const SyncFileIte
         return;
     }
 
-    if (!updateMetadata(item, false)) {
+    if (!updateMetadata(item)) {
         return;
     }
 
@@ -256,7 +256,7 @@ void BulkPropagatorDownloadJob::start(const SyncFileItemPtr &item)
     }
 }
 
-bool BulkPropagatorDownloadJob::updateMetadata(const SyncFileItemPtr &item, bool isConflict)
+bool BulkPropagatorDownloadJob::updateMetadata(const SyncFileItemPtr &item)
 {
     const auto fn = propagator()->fullLocalPath(item->_file);
     const auto result = propagator()->updateMetadata(*item);
@@ -270,10 +270,6 @@ bool BulkPropagatorDownloadJob::updateMetadata(const SyncFileItemPtr &item, bool
 
     propagator()->_journal->commit("download file start2");
 
-    if (isConflict) {
-        continueWithError(item, SyncFileItem::Conflict, {});
-    }
-
     // handle the special recall file
     if (!item->_remotePerm.hasPermission(RemotePermissions::IsShared)
         && (item->_file == QLatin1String(".sys.admin#recall#") || item->_file.endsWith(QLatin1String("/.sys.admin#recall#")))) {
@@ -314,12 +310,4 @@ void BulkPropagatorDownloadJob::abortWithError(SyncFileItemPtr item, SyncFileIte
     done(status);
 }
 
-void BulkPropagatorDownloadJob::continueWithError(SyncFileItemPtr item, SyncFileItem::Status status, const QString &error)
-{
-    qCInfo(lcBulkPropagatorDownloadJob) << "item finished with status" << status << error;
-    item->_errorString = error;
-    item->_status = status;
-    emit propagator()->itemCompleted(item, ErrorCategory::NoError);
-}
-
 }
diff --git a/src/libsync/bulkpropagatordownloadjob.h b/src/libsync/bulkpropagatordownloadjob.h
@@ -49,10 +49,9 @@ private slots:
     void done( const SyncFileItem::Status status);
 
     void abortWithError(SyncFileItemPtr item, SyncFileItem::Status status, const QString &error);
-    void continueWithError(SyncFileItemPtr item, SyncFileItem::Status status, const QString &error);
 
 private:
-    bool updateMetadata(const SyncFileItemPtr &item, bool isConflict);
+    bool updateMetadata(const SyncFileItemPtr &item);
     void checkPropagationIsDone();
 
     std::vector<SyncFileItemPtr> _filesToDownload;