summaryrefslogtreecommitdiffstats
path: root/apps/encryption/appinfo
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-03-28 11:02:26 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:28 +0200
commitc64e0af4fb44b1464ca3433e99b12b729a2084b2 (patch)
treed2528e9e4e375cddc665adeb4aa84fa27e62c989 /apps/encryption/appinfo
parent24c6604388c0c3a32517e1aa18ebd851e1f7a6a1 (diff)
downloadnextcloud-server-c64e0af4fb44b1464ca3433e99b12b729a2084b2.tar.gz
nextcloud-server-c64e0af4fb44b1464ca3433e99b12b729a2084b2.zip
check if recovery key exists and encrypt the file with the recovery key if needed
Diffstat (limited to 'apps/encryption/appinfo')
-rw-r--r--apps/encryption/appinfo/encryption.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/encryption/appinfo/encryption.php b/apps/encryption/appinfo/encryption.php
index d97aa07738c..dd8004a4880 100644
--- a/apps/encryption/appinfo/encryption.php
+++ b/apps/encryption/appinfo/encryption.php
@@ -102,7 +102,10 @@ 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'), $c->query('KeyManager'));
+ return new \OCA\Encryption\Crypto\Encryption(
+ $c->query('Crypt'),
+ $c->query('KeyManager'),
+ $c->query('Util'));
});
$module = $container->query('EncryptionModule');
$this->encryptionManager->registerEncryptionModule($module);