diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2017-05-30 12:54:58 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2017-07-06 11:47:10 +0200 |
| commit | 28a7e72868017fb545e8303f32c1204ffc4cc8c1 (patch) | |
| tree | fe2e01f2ac3a6b4e881fdcb730c2f7a0b763fc02 /apps/encryption/lib/AppInfo | |
| parent | da51ec38f4174532e83a4fde21f4c523e4f0bc7c (diff) | |
| download | nextcloud-server-28a7e72868017fb545e8303f32c1204ffc4cc8c1.tar.gz nextcloud-server-28a7e72868017fb545e8303f32c1204ffc4cc8c1.zip | |
after the master key was loaded we are ready to go, no re-login needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'apps/encryption/lib/AppInfo')
| -rw-r--r-- | apps/encryption/lib/AppInfo/Application.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php index 56c2dafdabd..c047489cec3 100644 --- a/apps/encryption/lib/AppInfo/Application.php +++ b/apps/encryption/lib/AppInfo/Application.php @@ -67,7 +67,11 @@ class Application extends \OCP\AppFramework\App { $session = $this->getContainer()->query('Session'); $session->setStatus(Session::RUN_MIGRATION); } - if ($this->encryptionManager->isEnabled() && $encryptionSystemReady) { + + } + + public function setUp() { + if ($this->encryptionManager->isEnabled()) { /** @var Setup $setup */ $setup = $this->getContainer()->query('UserSetup'); $setup->setupSystem(); @@ -77,7 +81,6 @@ class Application extends \OCP\AppFramework\App { /** * register hooks */ - public function registerHooks() { if (!$this->config->getSystemValue('maintenance', false)) { |