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

Encryption is ready if master key is enabled 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-07-21 09:16:43 +02:00 committed by backportbot[bot]
parent 0a90eeb62c
commit ba55e0ad53
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);
} }