diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-22 11:18:18 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-22 11:53:05 +0200 |
| commit | fc4127dd62bdd1d9bd9339797607615a250ba33f (patch) | |
| tree | e2ad8461ac3d85c378999aaf6a365fb5a0359a21 /apps/encryption/appinfo | |
| parent | 570718fb6bbad4dfd721b1ef451580749e9e0bdd (diff) | |
| download | nextcloud-server-fc4127dd62bdd1d9bd9339797607615a250ba33f.tar.gz nextcloud-server-fc4127dd62bdd1d9bd9339797607615a250ba33f.zip | |
add $encryptionModuleId to methods of Keys/IStorage
Diffstat (limited to 'apps/encryption/appinfo')
| -rw-r--r-- | apps/encryption/appinfo/application.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php index 243e227b6bb..fa620992c81 100644 --- a/apps/encryption/appinfo/application.php +++ b/apps/encryption/appinfo/application.php @@ -24,8 +24,10 @@ namespace OCA\Encryption\AppInfo; -use OC\Files\Filesystem; use OC\Files\View; +use OCA\Encryption\Controller\RecoveryController; +use OCA\Encryption\Controller\SettingsController; +use OCA\Encryption\Controller\StatusController; use OCA\Encryption\Crypto\Crypt; use OCA\Encryption\Crypto\Encryption; use OCA\Encryption\HookManager; @@ -126,11 +128,11 @@ class Application extends \OCP\AppFramework\App { function (IAppContainer $c) { $server = $c->getServer(); - return new KeyManager($server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID), + return new KeyManager($server->getEncryptionKeyStorage(), $c->query('Crypt'), $server->getConfig(), $server->getUserSession(), - new \OCA\Encryption\Session($server->getSession()), + new Session($server->getSession()), $server->getLogger(), $c->query('Util') ); @@ -146,14 +148,14 @@ class Application extends \OCP\AppFramework\App { $server->getSecureRandom(), $c->query('KeyManager'), $server->getConfig(), - $server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID), + $server->getEncryptionKeyStorage(), $server->getEncryptionFilesHelper(), - new \OC\Files\View()); + new View()); }); $container->registerService('RecoveryController', function (IAppContainer $c) { $server = $c->getServer(); - return new \OCA\Encryption\Controller\RecoveryController( + return new RecoveryController( $c->getAppName(), $server->getRequest(), $server->getConfig(), @@ -163,7 +165,7 @@ class Application extends \OCP\AppFramework\App { $container->registerService('StatusController', function (IAppContainer $c) { $server = $c->getServer(); - return new \OCA\Encryption\Controller\StatusController( + return new StatusController( $c->getAppName(), $server->getRequest(), $server->getL10N($c->getAppName()), @@ -173,7 +175,7 @@ class Application extends \OCP\AppFramework\App { $container->registerService('SettingsController', function (IAppContainer $c) { $server = $c->getServer(); - return new \OCA\Encryption\Controller\SettingsController( + return new SettingsController( $c->getAppName(), $server->getRequest(), $server->getL10N($c->getAppName()), |