Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-07-21 10:16:43 +0300
committerJulius Härtl <jus@bitgrid.net>2020-07-21 10:16:43 +0300
commitfc1596fada4591c8c87306241fbcf0e2c0229d7d (patch)
tree34ce13ace61946618188a81c4669f5bd8be8425a /apps/encryption
parent09e6b26bdd5d30c27e0da9576f5ead139634b33d (diff)
Encryption is ready if master key is enabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/Crypto/Encryption.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index 39dfece7629..7f7a3c9ea20 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -580,6 +580,9 @@ class Encryption implements IEncryptionModule {
* @since 9.1.0
*/
public function isReadyForUser($user) {
+ if ($this->util->isMasterKeyEnabled()) {
+ return true;
+ }
return $this->keyManager->userHasKeys($user);
}