summaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-11-21 00:19:39 +0100
committerMorris Jobke <hey@morrisjobke.de>2020-11-22 22:22:16 +0100
commit858c7f4032ca2fd7f8cc98ed1fe4f7467b9ba8ce (patch)
tree08791d74164a21cd9fba780d22e3c73ad86afc92 /apps/encryption
parente606c0eef47d4c39d1bdcdfa11447c08c6eab494 (diff)
downloadnextcloud-server-858c7f4032ca2fd7f8cc98ed1fe4f7467b9ba8ce.tar.gz
nextcloud-server-858c7f4032ca2fd7f8cc98ed1fe4f7467b9ba8ce.zip
Auto-wire remaining encryption app services that depend on View
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/AppInfo/Application.php54
1 files changed, 0 insertions, 54 deletions
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index 44a5a5af353..a5cbb30870c 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -29,7 +29,6 @@
namespace OCA\Encryption\AppInfo;
-use OC\Files\View;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Crypto\DecryptAll;
use OCA\Encryption\Crypto\EncryptAll;
@@ -43,9 +42,6 @@ use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
use OCP\Encryption\IManager;
use OCP\IConfig;
-use OCP\IServerContainer;
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Helper\QuestionHelper;
class Application extends \OCP\AppFramework\App {
@@ -61,7 +57,6 @@ class Application extends \OCP\AppFramework\App {
parent::__construct('encryption', $urlParams);
$this->encryptionManager = \OC::$server->getEncryptionManager();
$this->config = \OC::$server->getConfig();
- $this->registerServices();
}
public function setUp() {
@@ -121,53 +116,4 @@ class Application extends \OCP\AppFramework\App {
);
});
}
-
- public function registerServices() {
- $container = $this->getContainer();
-
-
- $container->registerService(Recovery::class, function (ContainerInterface $c) {
- /** @var IServerContainer $server */
- $server = $c->get(IServerContainer::class);
-
- return new Recovery(
- $server->getUserSession(),
- $c->get(Crypt::class),
- $c->get(KeyManager::class),
- $server->getConfig(),
- $server->getEncryptionFilesHelper(),
- new View());
- });
-
- $container->registerService(Util::class, function (ContainerInterface $c) {
- /** @var IServerContainer $server */
- $server = $c->get(IServerContainer::class);
-
- return new Util(
- new View(),
- $c->get(Crypt::class),
- $server->getLogger(),
- $server->getUserSession(),
- $server->getConfig(),
- $server->getUserManager());
- });
-
- $container->registerService(EncryptAll::class, function (ContainerInterface $c) {
- /** @var IServerContainer $server */
- $server = $c->get(IServerContainer::class);
- return new EncryptAll(
- $c->get(Setup::class),
- $server->getUserManager(),
- new View(),
- $c->get(KeyManager::class),
- $c->get(Util::class),
- $server->getConfig(),
- $server->getMailer(),
- $server->getL10N('encryption'),
- new QuestionHelper(),
- $server->getSecureRandom()
- );
- }
- );
- }
}