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

make master key the new default 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2017-05-30 11:40:40 +02:00
parent 984953ef4a
commit 9c5ba2f12c
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/encryption/appinfo/info.xml
View File

@ -33,6 +33,7 @@
</settings> </settings>
<commands> <commands>
<command>OCA\Encryption\Command\EnableMasterKey</command> <command>OCA\Encryption\Command\EnableMasterKey</command>
<command>OCA\Encryption\Command\DisableMasterKey</command>
<command>OCA\Encryption\Command\MigrateKeys</command> <command>OCA\Encryption\Command\MigrateKeys</command>
</commands> </commands>
</info> </info>

2
apps/encryption/lib/Util.php
View File

@ -136,7 +136,7 @@ class Util {
* @return bool * @return bool
*/ */
public function isMasterKeyEnabled() { public function isMasterKeyEnabled() {
$userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '0'); $userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '1');
return ($userMasterKey === '1'); return ($userMasterKey === '1');
} }