diff options
| author | Bjoern Schiessle <bjoern@schiessle.org> | 2017-05-30 11:40:40 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2017-07-06 11:33:03 +0200 |
| commit | 9c5ba2f12cf8f3a7b3587fd8ef304aed86e703e1 (patch) | |
| tree | ad0e229009eecc9c6f2f40e9e444ff9fec73a2d9 | |
| parent | 984953ef4a5917e672118a96e3b3714862011308 (diff) | |
| download | nextcloud-server-9c5ba2f12cf8f3a7b3587fd8ef304aed86e703e1.tar.gz nextcloud-server-9c5ba2f12cf8f3a7b3587fd8ef304aed86e703e1.zip | |
make master key the new default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| -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'); } |