diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/encryption/manager.php | 5 | ||||
| -rw-r--r-- | lib/public/iservercontainer.php | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php index fa50d32218d..7cd49d1c0e2 100644 --- a/lib/private/encryption/manager.php +++ b/lib/private/encryption/manager.php @@ -66,12 +66,15 @@ class Manager implements \OCP\Encryption\IManager { public function registerEncryptionModule(IEncryptionModule $module) { $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)) { diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index d7df884adf8..2db1fc32499 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -173,6 +173,18 @@ interface IServerContainer { function getL10N($app, $lang = null); /** + * @return \OC\Encryption\Manager + */ + function getEncryptionManager(); + + /** + * @param string $encryptionModuleId encryption module ID + * + * @return \OCP\Encryption\Keys\IStorage + */ + function getEncryptionKeyStorage($encryptionModuleId); + + /** * Returns the URL generator * * @return \OCP\IURLGenerator |