summaryrefslogtreecommitdiffstats
path: root/apps/encryption/appinfo/application.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/appinfo/application.php')
-rw-r--r--apps/encryption/appinfo/application.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 10ad610cd4a..cb9c33cfe58 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -52,12 +52,18 @@ class Application extends \OCP\AppFramework\App {
/**
* @param array $urlParams
+ * @param bool $encryptionSystemReady
*/
- public function __construct($urlParams = array()) {
+ public function __construct($urlParams = array(), $encryptionSystemReady = true) {
parent::__construct('encryption', $urlParams);
$this->encryptionManager = \OC::$server->getEncryptionManager();
$this->config = \OC::$server->getConfig();
$this->registerServices();
+ if($encryptionSystemReady === false) {
+ /** @var Session $session */
+ $session = $this->getContainer()->query('Session');
+ $session->setStatus(Session::RUN_MIGRATION);
+ }
}
/**