From a74ee674768cec92c85d313a27ea0c2de5aa29c1 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Wed, 1 Apr 2015 17:22:29 +0200 Subject: [PATCH] don't wrap share storages --- lib/private/encryption/manager.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index f8ac174479..484e0f540b 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -185,16 +185,19 @@ class Manager implements \OCP\Encryption\IManager { 'storage' => $storage, 'mountPoint' => $mountPoint, 'mount' => $mount]; - $manager = \OC::$server->getEncryptionManager(); - $util = new \OC\Encryption\Util( - new \OC\Files\View(), - \OC::$server->getUserManager(), - \OC::$server->getConfig()); - $user = \OC::$server->getUserSession()->getUser(); - $logger = \OC::$server->getLogger(); - $uid = $user ? $user->getUID() : null; - $fileHelper = \OC::$server->getEncryptionFilesHelper(); - return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid); - }); + + if (!($storage instanceof \OC\Files\Storage\Shared)) { + $manager = \OC::$server->getEncryptionManager(); + $util = new \OC\Encryption\Util( + new \OC\Files\View(), \OC::$server->getUserManager(), \OC::$server->getConfig()); + $user = \OC::$server->getUserSession()->getUser(); + $logger = \OC::$server->getLogger(); + $uid = $user ? $user->getUID() : null; + $fileHelper = \OC::$server->getEncryptionFilesHelper(); + return new Encryption($parameters, $manager, $util, $logger, $fileHelper, $uid); + } else { + return $storage; + } + }, 2); } }