@@ -21,8 +21,5 @@ | |||
namespace OCA\Encryption\AppInfo; | |||
if (!\OC::$CLI) { | |||
$di = \OC::$server; | |||
$app = new Application(); | |||
} | |||
$app = new Application(); | |||
$app->registerEncryptionModule(); |
@@ -55,7 +55,7 @@ class Application extends \OCP\AppFramework\App { | |||
$this->encryptionManager = \OC::$server->getEncryptionManager(); | |||
$this->config = \OC::$server->getConfig(); | |||
$this->registerServices(); | |||
$this->registerEncryptionModule(); | |||
// $this->registerEncryptionModule(); | |||
$this->registerHooks(); | |||
$this->registerSettings(); | |||
} |
@@ -69,14 +69,11 @@ class Manager implements \OCP\Encryption\IManager { | |||
$id = $module->getId(); | |||
$name = $module->getDisplayName(); | |||
// FIXME why do we load the same encryption module multiple times | |||
/* | |||
if (isset($this->encryptionModules[$id])) { | |||
$message = 'Id "' . $id . '" already used by encryption module "' . $name . '"'; | |||
throw new Exceptions\ModuleAlreadyExistsException($message); | |||
} | |||
*/ | |||
$defaultEncryptionModuleId = $this->getDefaultEncryptionModuleId(); | |||
if (empty($defaultEncryptionModuleId)) { |