mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable19] Encryption is ready if master key is enabled
This commit is contained in:
Morris Jobke 2020-07-21 20:33:13 +02:00 committed by GitHub
parent 9ce47b08c3 ba55e0ad53
commit 74615c3fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/encryption/lib/Crypto/Encryption.php
View File

@ -580,6 +580,9 @@ class Encryption implements IEncryptionModule {
* @since 9.1.0 * @since 9.1.0
*/ */
public function isReadyForUser($user) { public function isReadyForUser($user) {
if ($this->util->isMasterKeyEnabled()) {
return true;
}
return $this->keyManager->userHasKeys($user); return $this->keyManager->userHasKeys($user);
} }