Merge branch 'master' into file_encryption_external_storage_fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 4fc8fa75709..dd51a75f8f8 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -57,7 +57,7 @@ class Hooks {
 		

 		$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );

 

-		$session = new Session( $view );

+		$session = new \OCA\Encryption\Session( $view );

 		

 		$session->setPrivateKey( $privateKey, $params['uid'] );

 		

@@ -151,7 +151,7 @@ class Hooks {
 

 				$view = new \OC_FilesystemView('/');

 

-				$session = new Session($view);

+				$session = new \OCA\Encryption\Session($view);

 

 				// Get existing decrypted private key

 				$privateKey = $session->getPrivateKey();

@@ -266,7 +266,7 @@ class Hooks {
 		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {

 

 			$view = new \OC_FilesystemView('/');

-			$session = new Session($view);

+			$session = new \OCA\Encryption\Session($view);

 			$userId = \OCP\User::getUser();

 			$util = new Util($view, $userId);

 			$path = $util->fileIdToPath($params['itemSource']);

@@ -451,7 +451,7 @@ class Hooks {
         \OC_FileProxy::$enabled = false;

 

         $view = new \OC_FilesystemView('/');

-        $session = new Session($view);

+        $session = new \OCA\Encryption\Session($view);

         $userId = \OCP\User::getUser();

         $util = new Util( $view, $userId );