sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24289 from nextcloud/techdebt/noid/encryption-make-application-class-dependency-free 

[encryption] Remove dependency fetching inside the constructor and mo…
pull/24319/head
Morris Jobke 2020-11-23 16:23:21 +07:00 committed by GitHub
parent 5d88686b18 efe644137d
commit d9e0efbf72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/encryption/appinfo/app.php
Unescape Escape View File

@ -27,12 +27,13 @@ namespace OCA\Encryption\AppInfo;
\OCP\Util::addscript('encryption', 'encryption');
$encryptionSystemReady = \OC::$server->getEncryptionManager()->isReady();
$encryptionManager = \OC::$server->getEncryptionManager();
$encryptionSystemReady = $encryptionManager->isReady();
/** @var Application $app */
$app = \OC::$server->query(Application::class);
if ($encryptionSystemReady) {
$app->registerEncryptionModule();
$app->registerHooks();
$app->setUp();
$app->registerEncryptionModule($encryptionManager);
$app->registerHooks(\OC::$server->getConfig());
$app->setUp($encryptionManager);
}

21
apps/encryption/lib/AppInfo/Application.php
Unescape Escape View File

@ -44,23 +44,15 @@ use OCP\Encryption\IManager;
use OCP\IConfig;
class Application extends \OCP\AppFramework\App {
/** @var IManager */
private $encryptionManager;
/** @var IConfig */
private $config;
/**
* @param array $urlParams
*/
public function __construct($urlParams = []) {
parent::__construct('encryption', $urlParams);
$this->encryptionManager = \OC::$server->getEncryptionManager();
$this->config = \OC::$server->getConfig();
}
public function setUp() {
if ($this->encryptionManager->isEnabled()) {
public function setUp(IManager $encryptionManager) {
if ($encryptionManager->isEnabled()) {
/** @var Setup $setup */
$setup = $this->getContainer()->query(Setup::class);
$setup->setupSystem();
@ -70,8 +62,8 @@ class Application extends \OCP\AppFramework\App {
/**
* register hooks
*/
public function registerHooks() {
if (!$this->config->getSystemValueBool('maintenance')) {
public function registerHooks(IConfig $config) {
if (!$config->getSystemValueBool('maintenance')) {
$container = $this->getContainer();
$server = $container->getServer();
// Register our hooks and fire them.
@ -96,11 +88,10 @@ class Application extends \OCP\AppFramework\App {
}
}
public function registerEncryptionModule() {
public function registerEncryptionModule(IManager $encryptionManager) {
$container = $this->getContainer();
$this->encryptionManager->registerEncryptionModule(
$encryptionManager->registerEncryptionModule(
Encryption::ID,
Encryption::DISPLAY_NAME,
function () use ($container) {

4
tests/lib/Traits/EncryptionTrait.php
Unescape Escape View File

@ -14,6 +14,7 @@ use OC\Memcache\ArrayCache;
use OCA\Encryption\AppInfo\Application;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
use OCP\Encryption\IManager;
/**
* Enables encryption
@ -64,7 +65,8 @@ trait EncryptionTrait {
/** @var Setup $userSetup */
$userSetup = $container->query(Setup::class);
$userSetup->setupUser($name, $password);
$this->encryptionApp->setUp();
$encryptionManager = $container->query(IManager::class);
$this->encryptionApp->setUp($encryptionManager);
$keyManager->init($name, $password);
}