Fix issues.

Signed-off-by: alex-z <[email protected]>
nextcloud · Jun 19, 2023 · 628fc24 · 628fc24
1 parent be21c37
commit 628fc24
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/src/libsync/basepropagateremotedeleteencrypted.cpp b/src/libsync/basepropagateremotedeleteencrypted.cpp
@@ -75,7 +75,16 @@ void BasePropagateRemoteDeleteEncrypted::fetchMetadataForPath(const QString &pat
             &FetchAndUploadE2eeFolderMetadataJob::fetchFinished,
             this,
             &BasePropagateRemoteDeleteEncrypted::slotFetchMetadataJobFinished);
+    connect(_fetchAndUploadE2eeFolderMetadataJob.data(),
+            &FetchAndUploadE2eeFolderMetadataJob::uploadFinished,
+            this,
+            &BasePropagateRemoteDeleteEncrypted::slotUpdateMetadataJobFinished);
+    _fetchAndUploadE2eeFolderMetadataJob->fetchMetadata();
+}
 
+void BasePropagateRemoteDeleteEncrypted::uploadMetadata(bool keepLock)
+{
+    _fetchAndUploadE2eeFolderMetadataJob->uploadMetadata(keepLock);
 }
 
 void BasePropagateRemoteDeleteEncrypted::slotFolderUnLockFinished(const QByteArray &folderId, int statusCode)
@@ -144,11 +153,10 @@ void BasePropagateRemoteDeleteEncrypted::deleteRemoteItem(const QString &filenam
 {
     qCInfo(ABSTRACT_PROPAGATE_REMOVE_ENCRYPTED) << "Deleting nested encrypted item" << filename;
 
-    auto deleteJob = new DeleteJob(_propagator->account(), _propagator->fullRemotePath(filename), this);
+    const auto deleteJob = new DeleteJob(_propagator->account(), _propagator->fullRemotePath(filename), this);
     deleteJob->setFolderToken(_fetchAndUploadE2eeFolderMetadataJob->folderToken());
 
     connect(deleteJob, &DeleteJob::finishedSignal, this, &BasePropagateRemoteDeleteEncrypted::slotDeleteRemoteItemFinished);
-
     deleteJob->start();
 }
 
@@ -176,4 +184,14 @@ void BasePropagateRemoteDeleteEncrypted::taskFailed()
     }
 }
 
+QSharedPointer<FolderMetadata> BasePropagateRemoteDeleteEncrypted::folderMetadata() const
+{
+    return _fetchAndUploadE2eeFolderMetadataJob->folderMetadata();
+}
+
+const QByteArray BasePropagateRemoteDeleteEncrypted::folderToken() const
+{
+    return _fetchAndUploadE2eeFolderMetadataJob->folderToken();
+}
+
 } // namespace OCC
diff --git a/src/libsync/basepropagateremotedeleteencrypted.h b/src/libsync/basepropagateremotedeleteencrypted.h
@@ -47,22 +47,30 @@ class BasePropagateRemoteDeleteEncrypted : public QObject
     void storeFirstErrorString(const QString &errString);
 
     void fetchMetadataForPath(const QString &path);
-    virtual void slotFolderUnLockFinished(const QByteArray &folderId, int statusCode);
-    virtual void slotFetchMetadataJobFinished(int statusCode, const QString &message) = 0;
-    virtual void slotUpdateMetadataJobFinished(int statusCode, const QString &message) = 0;
-    void slotDeleteRemoteItemFinished();
+    void uploadMetadata(bool keepLock = false);
+
+    [[nodiscard]] QSharedPointer<FolderMetadata> folderMetadata() const;
+    [[nodiscard]] const QByteArray folderToken() const;
 
     void deleteRemoteItem(const QString &filename);
     void unlockFolder(bool success);
     void taskFailed();
 
+protected slots:
+    virtual void slotFolderUnLockFinished(const QByteArray &folderId, int statusCode);
+    virtual void slotFetchMetadataJobFinished(int statusCode, const QString &message) = 0;
+    virtual void slotUpdateMetadataJobFinished(int statusCode, const QString &message) = 0;
+    void slotDeleteRemoteItemFinished();
+
 protected:
     OwncloudPropagator *_propagator = nullptr;
     SyncFileItemPtr _item;
     bool _isTaskFailed = false;
     QNetworkReply::NetworkError _networkError = QNetworkReply::NoError;
     QString _errorString;
     QString _fullFolderRemotePath;
+
+private:
     QScopedPointer<FetchAndUploadE2eeFolderMetadataJob> _fetchAndUploadE2eeFolderMetadataJob;
 };
 

diff --git a/src/libsync/fetchanduploade2eefoldermetadatajob.cpp b/src/libsync/fetchanduploade2eefoldermetadatajob.cpp
@@ -238,6 +238,11 @@ void FetchAndUploadE2eeFolderMetadataJob::slotUploadMetadata()
 
     _uploadSignalEmitted = false;
 
+    if (!_folderMetadata->isValid()) {
+        slotUploadMetadataError(_folderId, -1);
+        return;
+    }
+
     const auto encryptedMetadata = _folderMetadata->encryptedMetadata();
     if (_isNewMetadataCreated) {
         const auto job = new StoreMetaDataApiJob(_account, _folderId, _folderToken, encryptedMetadata);
@@ -280,7 +285,7 @@ void FetchAndUploadE2eeFolderMetadataJob::slotEmitUploadSuccess()
 {
     if (!_uploadSignalEmitted) {
         _uploadSignalEmitted = true;
-        emit uploadFinished(0);
+        emit uploadFinished(200);
     }
 }
 

diff --git a/src/libsync/propagateremotedeleteencrypted.cpp b/src/libsync/propagateremotedeleteencrypted.cpp
@@ -58,7 +58,7 @@ void PropagateRemoteDeleteEncrypted::slotFetchMetadataJobFinished(int statusCode
         return;
     }
 
-    const auto metadata = _fetchAndUploadE2eeFolderMetadataJob->folderMetadata();
+    const auto metadata = folderMetadata();
 
     if (!metadata->isValid()) {
         taskFailed();
@@ -88,7 +88,7 @@ void PropagateRemoteDeleteEncrypted::slotFetchMetadataJobFinished(int statusCode
     }
 
     qCDebug(PROPAGATE_REMOVE_ENCRYPTED) << "Metadata updated, sending to the server.";
-    _fetchAndUploadE2eeFolderMetadataJob->uploadMetadata(true);
+    uploadMetadata(true);
 }
 
 void PropagateRemoteDeleteEncrypted::slotUpdateMetadataJobFinished(int statusCode, const QString &message)

diff --git a/src/libsync/propagateremotedeleteencryptedrootfolder.cpp b/src/libsync/propagateremotedeleteencryptedrootfolder.cpp
@@ -86,7 +86,7 @@ void PropagateRemoteDeleteEncryptedRootFolder::slotFetchMetadataJobFinished(int
         return;
     }
 
-    const auto metadata = _fetchAndUploadE2eeFolderMetadataJob->folderMetadata();
+    const auto metadata = folderMetadata();
 
     if (!metadata->isValid()) {
         taskFailed();
@@ -98,7 +98,7 @@ void PropagateRemoteDeleteEncryptedRootFolder::slotFetchMetadataJobFinished(int
     metadata->removeAllEncryptedFiles();
 
     qCDebug(PROPAGATE_REMOVE_ENCRYPTED_ROOTFOLDER) << "Metadata updated, sending to the server.";
-    _fetchAndUploadE2eeFolderMetadataJob->uploadMetadata(true);
+    uploadMetadata(true);
 }
 
 void PropagateRemoteDeleteEncryptedRootFolder::slotUpdateMetadataJobFinished(int statusCode, const QString &message)
@@ -182,7 +182,7 @@ void PropagateRemoteDeleteEncryptedRootFolder::deleteNestedRemoteItem(const QStr
     qCInfo(PROPAGATE_REMOVE_ENCRYPTED_ROOTFOLDER) << "Deleting nested encrypted remote item" << filename;
 
     auto deleteJob = new DeleteJob(_propagator->account(), _propagator->fullRemotePath(filename), this);
-    deleteJob->setFolderToken(_fetchAndUploadE2eeFolderMetadataJob->folderToken());
+    deleteJob->setFolderToken(folderToken());
     deleteJob->setProperty(encryptedFileNamePropertyKey, filename);
 
     connect(deleteJob, &DeleteJob::finishedSignal, this, &PropagateRemoteDeleteEncryptedRootFolder::slotDeleteNestedRemoteItemFinished);