Merge pull request #21935 from nextcloud/backport/21929/stable19

[stable19] Encryption is ready if master key is enabled
2020-07-21 20:33:13 +02:00 · 2020-07-21 20:33:13 +02:00 · 74615c3fb5
parent 9ce47b08c3 ba55e0ad53
commit 74615c3fb5
1 changed files with 3 additions and 0 deletions
--- 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);
 	}