Start managing a list of GetFolderEncryptStatusJob

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 7d6c0ef4503dd7df84fa21015b9681c9e790377f..f59051830338212155da0536f52c7659ae0aecca 100644 (file)
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -1241,7 +1241,8 @@ void ClientSideEncryption::getPublicKeyFromServer()
     job->start();
 }
 
-void ClientSideEncryption::fetchFolderEncryptedStatus() {
+void ClientSideEncryption::fetchFolderEncryptedStatus()
+{
     _refreshingEncryptionStatus = true;
     auto getEncryptedStatus = new GetFolderEncryptStatusJob(_account, QString());
     connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusReceived,
@@ -1249,10 +1250,17 @@ void ClientSideEncryption::fetchFolderEncryptedStatus() {
     connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusError,
                     this, &ClientSideEncryption::folderEncryptedStatusError);
     getEncryptedStatus->start();
+
+    _folderStatusJobs.append(getEncryptedStatus);
 }
 
 void ClientSideEncryption::folderEncryptedStatusFetched(const QHash<QString, bool>& result)
 {
+    auto job = static_cast<GetFolderEncryptStatusJob *>(sender());
+    Q_ASSERT(job);
+
+    _folderStatusJobs.removeAll(job);
+
     _refreshingEncryptionStatus = false;
     _folder2encryptedStatus = result;
     qCDebug(lcCse) << "Retrieved correctly the encrypted status of the folders." << result;
@@ -1261,6 +1269,11 @@ void ClientSideEncryption::folderEncryptedStatusFetched(const QHash<QString, boo
 
 void ClientSideEncryption::folderEncryptedStatusError(int error)
 {
+    auto job = static_cast<GetFolderEncryptStatusJob *>(sender());
+    Q_ASSERT(job);
+
+    _folderStatusJobs.removeAll(job);
+
     _refreshingEncryptionStatus = false;
     qCDebug(lcCse) << "Failed to retrieve the status of the folders." << error;
     emit folderEncryptedStatusFetchDone({});

diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h
index 13ec980432008c2aac250ad113d89e032d80864e..eea0e4a97b952bee26f06387774209147b077c2d 100644 (file)
--- a/src/libsync/clientsideencryption.h
+++ b/src/libsync/clientsideencryption.h
@@ -23,6 +23,8 @@ class ReadPasswordJob;
 
 namespace OCC {
 
+class GetFolderEncryptStatusJob;
+
 QString baseUrl();
 
 namespace EncryptionHelper {
@@ -125,6 +127,7 @@ private:
     //TODO: Save this on disk.
     QHash<QByteArray, QByteArray> _folder2token;
     QHash<QString, bool> _folder2encryptedStatus;
+    QVector<GetFolderEncryptStatusJob*> _folderStatusJobs;
 
 public:
     //QSslKey _privateKey;