upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #21936 from nextcloud/backport/21929/stable18

Browse source 
[stable18] Encryption is ready if master key is enabled
This commit is contained in:
Morris Jobke 2020-07-21 20:32:53 +02:00 committed by GitHub
commit 970a160ca7
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

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