From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Wed, 8 Jul 2020 13:16:53 +0000 (+0200)
Subject: Pass e2e-token to PropagateUpload subjobs
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~89
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=511a6e66dce2d40ccc3ee52114afc4c7f93b56a9;p=nextcloud-desktop.git

Pass e2e-token to PropagateUpload subjobs

The headers() method is used to pass extra headers to the PUT jobs for
instance, definitely needed for uploads now.

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

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 287c92c4f..633d897d7 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -735,6 +735,10 @@ QMap<QByteArray, QByteArray> PropagateUploadFileCommon::headers()
             headers["OC-ConflictBaseEtag"] = conflictRecord.baseEtag;
     }
 
+    if (_uploadEncryptedHelper && !_uploadEncryptedHelper->_folderToken.isEmpty()) {
+        headers.insert("e2e-token", _uploadEncryptedHelper->_folderToken);
+    }
+
     return headers;
 }