From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 21 Jul 2020 07:16:43 +0000 (+0200)
Subject: Encryption is ready if master key is enabled
X-Git-Tag: v20.0.0beta1~202^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc1596fada4591c8c87306241fbcf0e2c0229d7d;p=nextcloud-server.git

Encryption is ready if master key is enabled

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---

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);
 	}