]> source.dussan.org Git - nextcloud-server.git/commitdiff
Encryption is ready if master key is enabled 21929/head
authorJulius Härtl <jus@bitgrid.net>
Tue, 21 Jul 2020 07:16:43 +0000 (09:16 +0200)
committerJulius Härtl <jus@bitgrid.net>
Tue, 21 Jul 2020 07:16:43 +0000 (09:16 +0200)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
apps/encryption/lib/Crypto/Encryption.php

index 39dfece7629cb36e613c0570a1c74182aeb43e3c..7f7a3c9ea209081a064107f64ff1c4a09eef6b9f 100644 (file)
@@ -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);
        }