From 7fe4dd2163a612414e6ac53cc108c7251273a643 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 7 Dec 2017 18:06:55 +0100 Subject: [PATCH] [CSE] Renane GetFolderEncryptStatus to GetFolderEncryptStatusJob it's a network job after all --- src/libsync/clientsideencryption.cpp | 12 ++++++------ src/libsync/clientsideencryption.h | 4 ++-- src/libsync/propagateupload.cpp | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index 7da5f1859..8f777f5ef 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -984,10 +984,10 @@ void ClientSideEncryption::getPublicKeyFromServer() void ClientSideEncryption::fetchFolderEncryptedStatus() { _refreshingEncryptionStatus = true; - auto getEncryptedStatus = new GetFolderEncryptStatus(_account, QString()); - connect(getEncryptedStatus, &GetFolderEncryptStatus::encryptStatusReceived, + auto getEncryptedStatus = new GetFolderEncryptStatusJob(_account, QString()); + connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusReceived, this, &ClientSideEncryption::folderEncryptedStatusFetched); - connect(getEncryptedStatus, &GetFolderEncryptStatus::encryptStatusError, + connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusError, this, &ClientSideEncryption::folderEncryptedStatusError); getEncryptedStatus->start(); } @@ -1483,12 +1483,12 @@ bool GetMetadataApiJob::finished() return true; } -GetFolderEncryptStatus::GetFolderEncryptStatus(const AccountPtr& account, const QString& folder, QObject *parent) +GetFolderEncryptStatusJob::GetFolderEncryptStatusJob(const AccountPtr& account, const QString& folder, QObject *parent) : OCC::AbstractNetworkJob(account, QStringLiteral("remote.php/webdav"), parent), _folder(folder) { } -void GetFolderEncryptStatus::start() +void GetFolderEncryptStatusJob::start() { QNetworkRequest req; req.setPriority(QNetworkRequest::HighPriority); @@ -1505,7 +1505,7 @@ void GetFolderEncryptStatus::start() AbstractNetworkJob::start(); } -bool GetFolderEncryptStatus::finished() +bool GetFolderEncryptStatusJob::finished() { qCInfo(lcCse()) << "GetFolderEncryptStatus of" << reply()->request().url() << "finished with status" << reply()->error() diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h index ffeed550f..f2d931971 100644 --- a/src/libsync/clientsideencryption.h +++ b/src/libsync/clientsideencryption.h @@ -337,11 +337,11 @@ private: /* I cant use the propfind network job because it defaults to the * wrong dav url. */ -class OWNCLOUDSYNC_EXPORT GetFolderEncryptStatus : public AbstractNetworkJob +class OWNCLOUDSYNC_EXPORT GetFolderEncryptStatusJob : public AbstractNetworkJob { Q_OBJECT public: - explicit GetFolderEncryptStatus (const AccountPtr &account, const QString& folder, QObject *parent = 0); + explicit GetFolderEncryptStatusJob (const AccountPtr &account, const QString& folder, QObject *parent = 0); public slots: void start() override; diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index 0631db984..fd0c224ae 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -194,12 +194,12 @@ void PropagateUploadFileCommon::start() */ QFileInfo info(_item->_file); - auto getEncryptedStatus = new GetFolderEncryptStatus(propagator()->account(), + auto getEncryptedStatus = new GetFolderEncryptStatusJob(propagator()->account(), info.path()); - connect(getEncryptedStatus, &GetFolderEncryptStatus::encryptStatusReceived, + connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusReceived, this, &PropagateUploadFileCommon::slotFolderEncryptedStatusFetched); - connect(getEncryptedStatus, &GetFolderEncryptStatus::encryptStatusError, + connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusError, this, &PropagateUploadFileCommon::slotFolderEncryptedStatusError); getEncryptedStatus->start(); } else {