From d7a9a4cd0978e924ce787955ee6cf2d2a54e472f Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Tue, 30 Jun 2020 11:21:02 +0200 Subject: [PATCH] Fix parenting issues of PropagateUploadEncrypted Signed-off-by: Kevin Ottens --- src/libsync/propagateremotemkdir.cpp | 2 +- src/libsync/propagateupload.cpp | 2 +- src/libsync/propagateuploadencrypted.cpp | 7 ++++--- src/libsync/propagateuploadencrypted.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp index 15975543a..cd6bfdb1c 100644 --- a/src/libsync/propagateremotemkdir.cpp +++ b/src/libsync/propagateremotemkdir.cpp @@ -132,7 +132,7 @@ void PropagateRemoteMkdir::slotMkdir() } // We should be encrypted as well since our parent is - _uploadEncryptedHelper = new PropagateUploadEncrypted(propagator(), remoteParentPath, _item); + _uploadEncryptedHelper = new PropagateUploadEncrypted(propagator(), remoteParentPath, _item, this); connect(_uploadEncryptedHelper, &PropagateUploadEncrypted::folderNotEncrypted, this, &PropagateRemoteMkdir::slotStartMkcolJob); connect(_uploadEncryptedHelper, &PropagateUploadEncrypted::finalized, diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index cd4cc4e2d..89cfb7343 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -198,7 +198,7 @@ void PropagateUploadFileCommon::start() return; } - _uploadEncryptedHelper = new PropagateUploadEncrypted(propagator(), remoteParentPath, _item); + _uploadEncryptedHelper = new PropagateUploadEncrypted(propagator(), remoteParentPath, _item, this); connect(_uploadEncryptedHelper, &PropagateUploadEncrypted::folderNotEncrypted, this, &PropagateUploadFileCommon::setupUnencryptedFile); connect(_uploadEncryptedHelper, &PropagateUploadEncrypted::finalized, diff --git a/src/libsync/propagateuploadencrypted.cpp b/src/libsync/propagateuploadencrypted.cpp index dea1029e3..f8cce69ae 100644 --- a/src/libsync/propagateuploadencrypted.cpp +++ b/src/libsync/propagateuploadencrypted.cpp @@ -16,8 +16,9 @@ namespace OCC { Q_LOGGING_CATEGORY(lcPropagateUploadEncrypted, "nextcloud.sync.propagator.upload.encrypted", QtInfoMsg) -PropagateUploadEncrypted::PropagateUploadEncrypted(OwncloudPropagator *propagator, const QString &remoteParentPath, SyncFileItemPtr item) - : _propagator(propagator) +PropagateUploadEncrypted::PropagateUploadEncrypted(OwncloudPropagator *propagator, const QString &remoteParentPath, SyncFileItemPtr item, QObject *parent) + : QObject(parent) + , _propagator(propagator) , _remoteParentPath(remoteParentPath) , _item(item) , _metadata(nullptr) @@ -39,7 +40,7 @@ void PropagateUploadEncrypted::start() * If the folder is unencrypted we just follow the old way. */ qCDebug(lcPropagateUploadEncrypted) << "Starting to send an encrypted file!"; - auto getEncryptedStatus = new GetFolderEncryptStatusJob(_propagator->account(), _remoteParentPath); + auto getEncryptedStatus = new GetFolderEncryptStatusJob(_propagator->account(), _remoteParentPath, this); connect(getEncryptedStatus, &GetFolderEncryptStatusJob::encryptStatusFolderReceived, this, &PropagateUploadEncrypted::slotFolderEncryptedStatusFetched); diff --git a/src/libsync/propagateuploadencrypted.h b/src/libsync/propagateuploadencrypted.h index ae7981f9d..33ddbb597 100644 --- a/src/libsync/propagateuploadencrypted.h +++ b/src/libsync/propagateuploadencrypted.h @@ -32,7 +32,7 @@ class PropagateUploadEncrypted : public QObject { Q_OBJECT public: - PropagateUploadEncrypted(OwncloudPropagator *propagator, const QString &remoteParentPath, SyncFileItemPtr item); + PropagateUploadEncrypted(OwncloudPropagator *propagator, const QString &remoteParentPath, SyncFileItemPtr item, QObject *parent = nullptr); void start(); /* unlocks the current folder that holds this file */ -- 2.30.2