mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The Encryption manager belongs in Server.php 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-11-01 10:48:27 +01:00
parent 9c28d2d7c4
commit fbd0d0bdcf
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/AppFramework/DependencyInjection/DIContainer.php
View File

@ -148,10 +148,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->getServer()->getThemingDefaults(); return $c->getServer()->getThemingDefaults();
}); });
$this->registerService(IManager::class, function ($c) {
return $this->getServer()->getEncryptionManager();
});
$this->registerService(IConfig::class, function ($c) { $this->registerService(IConfig::class, function ($c) {
return $c->query(OC\GlobalScale\Config::class); return $c->query(OC\GlobalScale\Config::class);
}); });

3
lib/private/Server.php
View File

@ -217,7 +217,7 @@ class Server extends ServerContainer implements IServerContainer {
); );
}); });
$this->registerService('EncryptionManager', function (Server $c) { $this->registerService(\OCP\Encryption\IManager::class, function (Server $c) {
$view = new View(); $view = new View();
$util = new Encryption\Util( $util = new Encryption\Util(
$view, $view,
@ -234,6 +234,7 @@ class Server extends ServerContainer implements IServerContainer {
new ArrayCache() new ArrayCache()
); );
}); });
$this->registerAlias('EncryptionManager', \OCP\Encryption\IManager::class);
$this->registerService('EncryptionFileHelper', function (Server $c) { $this->registerService('EncryptionFileHelper', function (Server $c) {
$util = new Encryption\Util( $util = new Encryption\Util(