From ee8e0fa3322cf677619a4a036370eb6dad3bb3da Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 7 Dec 2020 17:38:18 +0100 Subject: [PATCH] Have the folder token inside the EncryptFolderJob No need to look for a token on the outside we can just work properly by keeping all the state encapsulated in the job. Signed-off-by: Kevin Ottens --- src/libsync/encryptfolderjob.cpp | 8 +++----- src/libsync/encryptfolderjob.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libsync/encryptfolderjob.cpp b/src/libsync/encryptfolderjob.cpp index bbf8619ff..2fa091ae4 100644 --- a/src/libsync/encryptfolderjob.cpp +++ b/src/libsync/encryptfolderjob.cpp @@ -63,7 +63,7 @@ void EncryptFolderJob::slotEncryptionFlagError(const QByteArray &fileId, int htt void EncryptFolderJob::slotLockForEncryptionSuccess(const QByteArray &fileId, const QByteArray &token) { - _account->e2e()->setTokenForFolder(fileId, token); + _folderToken = token; FolderMetadata emptyMetadata(_account); auto encryptedMetadata = emptyMetadata.encryptedMetadata(); @@ -85,8 +85,7 @@ void EncryptFolderJob::slotLockForEncryptionSuccess(const QByteArray &fileId, co void EncryptFolderJob::slotUploadMetadataSuccess(const QByteArray &folderId) { - const auto token = _account->e2e()->tokenForFolder(folderId); - auto unlockJob = new UnlockEncryptFolderApiJob(_account, folderId, token, this); + auto unlockJob = new UnlockEncryptFolderApiJob(_account, folderId, _folderToken, this); connect(unlockJob, &UnlockEncryptFolderApiJob::success, this, &EncryptFolderJob::slotUnlockFolderSuccess); connect(unlockJob, &UnlockEncryptFolderApiJob::error, @@ -98,8 +97,7 @@ void EncryptFolderJob::slotUpdateMetadataError(const QByteArray &folderId, int h { Q_UNUSED(httpReturnCode); - const auto token = _account->e2e()->tokenForFolder(folderId); - auto unlockJob = new UnlockEncryptFolderApiJob(_account, folderId, token, this); + auto unlockJob = new UnlockEncryptFolderApiJob(_account, folderId, _folderToken, this); connect(unlockJob, &UnlockEncryptFolderApiJob::success, this, &EncryptFolderJob::slotUnlockFolderSuccess); connect(unlockJob, &UnlockEncryptFolderApiJob::error, diff --git a/src/libsync/encryptfolderjob.h b/src/libsync/encryptfolderjob.h index 142e25345..ff071f8f2 100644 --- a/src/libsync/encryptfolderjob.h +++ b/src/libsync/encryptfolderjob.h @@ -51,6 +51,7 @@ private: AccountPtr _account; QString _path; QByteArray _fileId; + QByteArray _folderToken; QString _errorString; }; } -- 2.30.2