Fix namespace of Files_Encryption outside of the app

diff --git a/apps/files/index.php b/apps/files/index.php
index 4142a02b97e04f17627d2dd0d851ce53216f42c7..6635d70d008f59db22106863415ba8293efa14b9 100644 (file)
--- 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 b9d7a4aa6cf11a1edc6b0e98f6138b1e3df07cba..1e8f31dbd2af41a57f2c0a46a39ebbc7cb2cf311 100644 (file)
--- 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 d93b8e68eb65e91b6a913338406f256175578352..54eea54552fdf804ad397073baf634e00c1c8329 100644 (file)
--- 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 527e5b8fcee4c88e37c624d4d71d0f8215067cfb..0ad25927461e6592d78576faa9fccb1d4d948e8b 100644 (file)
--- 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 ee596c3e7ed2c09aa03cd70967c8b228a780f82c..4ed907daf96f4ce00d41bfca97894bb3b57dcadd 100644 (file)
--- 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;