From 83cb382b3fb919bc7ce2d4e7f1fea027c3867460 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 1 Apr 2015 10:37:48 +0200
Subject: [PATCH] pass file helper to encryption wrapper

---
 lib/private/encryption/manager.php               | 3 ++-
 lib/private/files/storage/wrapper/encryption.php | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index cf11c3cf335..77f02b0c489 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -194,7 +194,8 @@ class Manager implements \OCP\Encryption\IManager {
 			$user = \OC::$server->getUserSession()->getUser();
 			$logger = \OC::$server->getLogger();
 			$uid = $user ? $user->getUID() : null;
-			return new Encryption($parameters, $manager, $util, $logger, $uid);
+			$fileHelper = \OC::$server->getEncryptionFilesHelper();
+			return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid);
 		});
 	}
 }
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index cea7a38d41b..43052af8448 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -45,11 +45,15 @@ class Encryption extends Wrapper {
 	/** @var array */
 	private $unencryptedSize;
 
+	/** @var \OC\Encryption\File */
+	private $fileHelper;
+
 	/**
 	 * @param array $parameters
 	 * @param \OC\Encryption\Manager $encryptionManager
 	 * @param \OC\Encryption\Util $util
 	 * @param \OC\Log $logger
+	 * @param \OC\Encryption\File $fileHelper
 	 * @param string $uid user who perform the read/write operation (null for public access)
 	 */
 	public function __construct(
@@ -57,6 +61,7 @@ class Encryption extends Wrapper {
 			\OC\Encryption\Manager $encryptionManager = null,
 			\OC\Encryption\Util $util = null,
 			\OC\Log $logger = null,
+			\OC\Encryption\File $fileHelper = null,
 			$uid = null
 		) {
 
@@ -65,6 +70,7 @@ class Encryption extends Wrapper {
 		$this->util = $util;
 		$this->logger = $logger;
 		$this->uid = $uid;
+		$this->fileHelper = $fileHelper;
 		$this->unencryptedSize = array();
 		parent::__construct($parameters);
 	}
@@ -250,7 +256,7 @@ class Encryption extends Wrapper {
 				$uid = $owner;
 			}
 			$handle = \OC\Files\Stream\Encryption::wrap($source, $path, $fullPath, $header,
-				$uid, $encryptionModule, $this->storage, $this, $this->util, $mode,
+				$uid, $encryptionModule, $this->storage, $this, $this->util, $this->fileHelper, $mode,
 				$size, $unencryptedSize);
 			return $handle;
 		} else {
-- 
2.39.5