Fix parenting issues of PropagateUploadEncrypted

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

diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
index 15975543a00b852174803e9dfbdee12e77fc88a6..cd6bfdb1cfa82fcd4597ac689033d181a5038cc9 100644 (file)
--- 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 cd4cc4e2d431e82d25dfa9b14ce624e2fa54f462..89cfb7343f8fa227d2aefe16fa3248876fada587 100644 (file)
--- 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 dea1029e30f283dd7847357352be040c01882ba3..f8cce69ae045a7d615ebf0cc8721ed330e458c31 100644 (file)
--- 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 ae7981f9d6c7b21b9c6ecfc0441f094135381cf9..33ddbb59753a001a670ef8e1c10f39cd8a89ce40 100644 (file)
--- 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 */