From 78a307995c510c0184d915fcab26baa3be815342 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 3 Dec 2014 16:16:09 +0100
Subject: [PATCH] Fix namespace of Files_Encryption outside of the app

---
 apps/files/index.php                   | 2 +-
 apps/files_trashbin/lib/trashbin.php   | 4 ++--
 lib/private/connector/sabre/file.php   | 4 ++--
 settings/ajax/decryptall.php           | 2 +-
 settings/changepassword/controller.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index 4142a02b97e..6635d70d008 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -69,7 +69,7 @@ $storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
 // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
 $encryptionInitStatus = 2;
 if (OC_App::isEnabled('files_encryption')) {
-	$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+	$session = new \OCA\Files_Encryption\Session(new \OC\Files\View('/'));
 	$encryptionInitStatus = $session->getInitialized();
 }
 
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index b9d7a4aa6cf..1e8f31dbd2a 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -274,7 +274,7 @@ class Trashbin {
 				return 0;
 			}
 
-			$util = new \OCA\Encryption\Util($rootView, $user);
+			$util = new \OCA\Files_Encryption\Util($rootView, $user);
 
 			$baseDir = '/files_encryption/';
 			if (!$util->isSystemWideMountPoint($ownerPath)) {
@@ -448,7 +448,7 @@ class Trashbin {
 				return false;
 			}
 
-			$util = new \OCA\Encryption\Util($rootView, $user);
+			$util = new \OCA\Files_Encryption\Util($rootView, $user);
 
 			$baseDir = '/files_encryption/';
 			if (!$util->isSystemWideMountPoint($ownerPath)) {
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index d93b8e68eb6..54eea54552f 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -104,7 +104,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		} catch (\OCP\Files\LockNotAcquiredException $e) {
 			// the file is currently being written to by another process
 			throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
-		} catch (\OCA\Encryption\Exception\EncryptionException $e) {
+		} catch (\OCA\Files_Encryption\Exception\EncryptionException $e) {
 			throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -166,7 +166,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		} else {
 			try {
 				return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
-			} catch (\OCA\Encryption\Exception\EncryptionException $e) {
+			} catch (\OCA\Files_Encryption\Exception\EncryptionException $e) {
 				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
 			} catch (\OCP\Files\StorageNotAvailableException $e) {
 				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index 527e5b8fcee..0ad25927461 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -11,7 +11,7 @@ $params = array('uid' => \OCP\User::getUser(),
 				'password' => $_POST['password']);
 
 $view = new OC\Files\View('/');
-$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+$util = new \OCA\Files_Encryption\Util($view, \OCP\User::getUser());
 $l = \OC::$server->getL10N('settings');
 
 $result = $util->initEncryption($params);
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index ee596c3e7ed..4ed907daf96 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -52,7 +52,7 @@ class Controller {
 
 		if (\OC_App::isEnabled('files_encryption')) {
 			//handle the recovery case
-			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $username);
+			$util = new \OCA\Files_Encryption\Util(new \OC\Files\View('/'), $username);
 			$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 
 			$validRecoveryPassword = false;
-- 
2.39.5