Skip to content

[encryption] Remove dependency fetching inside the constructor and mo… #24289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Nov 23, 2020
Merged

[encryption] Remove dependency fetching inside the constructor and mo… #24289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions apps/encryption/appinfo/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@

\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 changes: 6 additions & 15 deletions apps/encryption/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,15 @@
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();
Expand All @@ -70,8 +62,8 @@ public function setUp() {
/**
* 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.
Expand All @@ -96,11 +88,10 @@ public function registerHooks() {
}
}

public function registerEncryptionModule() {
public function registerEncryptionModule(IManager $encryptionManager) {
$container = $this->getContainer();


$this->encryptionManager->registerEncryptionModule(
$encryptionManager->registerEncryptionModule(
Encryption::ID,
Encryption::DISPLAY_NAME,
function () use ($container) {
Expand Down
4 changes: 3 additions & 1 deletion tests/lib/Traits/EncryptionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use OCA\Encryption\AppInfo\Application;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
use OCP\Encryption\IManager;

/**
* Enables encryption
Expand Down Expand Up @@ -64,7 +65,8 @@ protected function setupForUser($name, $password) {
/** @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);
}

Expand Down