diff options
Diffstat (limited to 'apps/encryption')
| -rw-r--r-- | apps/encryption/appinfo/info.xml | 1 | ||||
| -rw-r--r-- | apps/encryption/lib/Util.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 7cfdc934386..e1959ac8a9b 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -33,6 +33,7 @@ </settings> <commands> <command>OCA\Encryption\Command\EnableMasterKey</command> + <command>OCA\Encryption\Command\DisableMasterKey</command> <command>OCA\Encryption\Command\MigrateKeys</command> </commands> </info> diff --git a/apps/encryption/lib/Util.php b/apps/encryption/lib/Util.php index 72afa68aad2..d6ae9bd7e5e 100644 --- a/apps/encryption/lib/Util.php +++ b/apps/encryption/lib/Util.php @@ -136,7 +136,7 @@ class Util { * @return bool */ public function isMasterKeyEnabled() { - $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '0'); + $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1'); return ($userMasterKey === '1'); } |