summaryrefslogtreecommitdiffstats
path: root/apps/encryption/appinfo
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2016-03-02 13:58:06 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2016-03-18 11:06:14 +0100
commit5e267589d40400223e5dce692568ab2933be14f7 (patch)
tree018f66a48dacf80ab512c3d1898359f420b173b6 /apps/encryption/appinfo
parenta6c921267e00d0fb5021e8bdbd4d202931d7a58a (diff)
downloadnextcloud-server-5e267589d40400223e5dce692568ab2933be14f7.tar.gz
nextcloud-server-5e267589d40400223e5dce692568ab2933be14f7.zip
only create and update user specific key if no master key is enabled
Diffstat (limited to 'apps/encryption/appinfo')
-rw-r--r--apps/encryption/appinfo/application.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 6d01d3e8353..6080a29d5f4 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -66,6 +66,11 @@ class Application extends \OCP\AppFramework\App {
$session = $this->getContainer()->query('Session');
$session->setStatus(Session::RUN_MIGRATION);
}
+ if ($this->encryptionManager->isEnabled() && $encryptionSystemReady) {
+ /** @var Setup $setup */
+ $setup = $this->getContainer()->query('UserSetup');
+ $setup->setupSystem();
+ }
}
/**