Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
This commit is contained in:
commit
85dbaeee97
21
lib/base.php
21
lib/base.php
|
@ -718,25 +718,8 @@ class OC {
|
||||||
private static function registerEncryptionHooks() {
|
private static function registerEncryptionHooks() {
|
||||||
$enabled = self::$server->getEncryptionManager()->isEnabled();
|
$enabled = self::$server->getEncryptionManager()->isEnabled();
|
||||||
if ($enabled) {
|
if ($enabled) {
|
||||||
$user = \OC::$server->getUserSession()->getUser();
|
\OCP\Util::connectHook('OCP\Share', 'post_shared', 'OC\Encryption\HookManager', 'postShared');
|
||||||
$uid = '';
|
\OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OC\Encryption\HookManager', 'postUnshared');
|
||||||
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');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||||
|
* @license AGPL-3.0
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Encryption;
|
||||||
|
|
||||||
|
use OC\Files\Filesystem;
|
||||||
|
use OC\Files\View;
|
||||||
|
|
||||||
|
class HookManager {
|
||||||
|
/**
|
||||||
|
* @var Update
|
||||||
|
*/
|
||||||
|
private static $updater;
|
||||||
|
|
||||||
|
public static function postShared($params) {
|
||||||
|
self::getUpdate()->postShared($params);
|
||||||
|
}
|
||||||
|
public static function postUnshared($params) {
|
||||||
|
self::getUpdate()->postUnshared($params);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Update
|
||||||
|
*/
|
||||||
|
private static function getUpdate() {
|
||||||
|
if (is_null(self::$updater)) {
|
||||||
|
$user = \OC::$server->getUserSession()->getUser();
|
||||||
|
$uid = '';
|
||||||
|
if ($user) {
|
||||||
|
$uid = $user->getUID();
|
||||||
|
}
|
||||||
|
self::$updater = new Update(
|
||||||
|
new View(),
|
||||||
|
new Util(
|
||||||
|
new View(),
|
||||||
|
\OC::$server->getUserManager(),
|
||||||
|
\OC::$server->getGroupManager(),
|
||||||
|
\OC::$server->getConfig()),
|
||||||
|
Filesystem::getMountManager(),
|
||||||
|
\OC::$server->getEncryptionManager(),
|
||||||
|
\OC::$server->getEncryptionFilesHelper(),
|
||||||
|
$uid
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return self::$updater;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue