summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-17 13:55:31 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-17 13:55:31 +0200
commitd9990c2b4e9fb3fdc1867493e35a0bfcfd98b3ba (patch)
tree38be69f628d9e93d94d180aaf1f377d1593bb735 /lib/base.php
parentaef6ecdbf1fbe748acb64bcf8d1abdf14ea51e97 (diff)
downloadnextcloud-server-d9990c2b4e9fb3fdc1867493e35a0bfcfd98b3ba.tar.gz
nextcloud-server-d9990c2b4e9fb3fdc1867493e35a0bfcfd98b3ba.zip
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php21
1 files changed, 2 insertions, 19 deletions
diff --git a/lib/base.php b/lib/base.php
index 80f2736fcf6..7e6183520e1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -718,25 +718,8 @@ class OC {
private static function registerEncryptionHooks() {
$enabled = self::$server->getEncryptionManager()->isEnabled();
if ($enabled) {
- $user = \OC::$server->getUserSession()->getUser();
- $uid = '';
- if ($user) {
- $uid = $user->getUID();
- }
- $updater = new \OC\Encryption\Update(
- new \OC\Files\View(),
- new \OC\Encryption\Util(
- new \OC\Files\View(),
- \OC::$server->getUserManager(),
- \OC::$server->getGroupManager(),
- \OC::$server->getConfig()),
- \OC\Files\Filesystem::getMountManager(),
- \OC::$server->getEncryptionManager(),
- \OC::$server->getEncryptionFilesHelper(),
- $uid
- );
- \OCP\Util::connectHook('OCP\Share', 'post_shared', $updater, 'postShared');
- \OCP\Util::connectHook('OCP\Share', 'post_unshare', $updater, 'postUnshared');
+ \OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
+ \OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
}
}