diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-03-26 12:23:36 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:27 +0200 |
| commit | 198b73fe322281a297fd8fcc5e7a10762996ce86 (patch) | |
| tree | 63511d685368b5569e5eb2906fc9e38f3045b043 /apps/encryption/appinfo | |
| parent | 7ffd77fac9f0baadbbaac6e0dd7e62de78197b52 (diff) | |
| download | nextcloud-server-198b73fe322281a297fd8fcc5e7a10762996ce86.tar.gz nextcloud-server-198b73fe322281a297fd8fcc5e7a10762996ce86.zip | |
write encrypted file to disc
Diffstat (limited to 'apps/encryption/appinfo')
| -rw-r--r-- | apps/encryption/appinfo/encryption.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/encryption/appinfo/encryption.php b/apps/encryption/appinfo/encryption.php index a3ca8ec5624..8be3cae5ad5 100644 --- a/apps/encryption/appinfo/encryption.php +++ b/apps/encryption/appinfo/encryption.php @@ -27,7 +27,6 @@ use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\HookManager; use OCA\Encryption\Hooks\UserHooks; use OCA\Encryption\KeyManager; -use OCA\Encryption\Migrator; use OCA\Encryption\Recovery; use OCA\Encryption\Users\Setup; use OCA\Encryption\Util; @@ -98,7 +97,7 @@ class Encryption extends \OCP\AppFramework\App { public function registerEncryptionModule() { $container = $this->getContainer(); $container->registerService('EncryptionModule', function (IAppContainer $c) { - return new \OCA\Encryption\Crypto\Encryption($c->query('Crypt')); + return new \OCA\Encryption\Crypto\Encryption($c->query('Crypt'), $c->query('KeyManager')); }); $module = $container->query('EncryptionModule'); $this->encryptionManager->registerEncryptionModule($module); @@ -122,8 +121,7 @@ class Encryption extends \OCP\AppFramework\App { function (IAppContainer $c) { $server = $c->getServer(); - $moduleId = $c->query('EncryptionModule')->getId(); - return new KeyManager($server->getEncryptionKeyStorage($moduleId), + return new KeyManager($server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID), $c->query('Crypt'), $server->getConfig(), $server->getUserSession(), @@ -137,14 +135,13 @@ class Encryption extends \OCP\AppFramework\App { function (IAppContainer $c) { $server = $c->getServer(); - $moduleId = $c->query('EncryptionModule')->getId(); return new Recovery( $server->getUserSession(), $c->query('Crypt'), $server->getSecureRandom(), $c->query('KeyManager'), $server->getConfig(), - $server->getEncryptionKeyStorage($moduleId)); + $server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID)); }); $container->registerService('UserSetup', |