From 1716b83d843a39c0f684ff3d0512af55e68712b5 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 24 Aug 2020 10:29:29 +0200 Subject: [PATCH] Fixes regression that prevented you from toggling the encryption flag Signed-off-by: Georg Ehrke --- lib/Settings/WhoHasAccessSettings.php | 4 ++-- src/components/Encryption.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Settings/WhoHasAccessSettings.php b/lib/Settings/WhoHasAccessSettings.php index 6f1173dc..ad65b3ea 100644 --- a/lib/Settings/WhoHasAccessSettings.php +++ b/lib/Settings/WhoHasAccessSettings.php @@ -72,8 +72,8 @@ public function getForm():TemplateResponse { } $this->initialStateService->provideInitialState('privacy', 'privacyPolicyUrl', $privacyPolicyUrl); - $this->initialStateService->provideInitialState('privacy', 'fullDiskEncryptionEnabled', $this->config->getAppValue('privacy', 'fullDiskEncryptionEnabled', '0')); - $this->initialStateService->provideInitialState('privacy', 'serverSideEncryptionEnabled', $this->encryptionManager->isEnabled() ? '1' : '0'); + $this->initialStateService->provideInitialState('privacy', 'fullDiskEncryptionEnabled', $this->config->getAppValue('privacy', 'fullDiskEncryptionEnabled', '0') === '1'); + $this->initialStateService->provideInitialState('privacy', 'serverSideEncryptionEnabled', $this->encryptionManager->isEnabled()); return new TemplateResponse('privacy', 'who-has-access'); } diff --git a/src/components/Encryption.vue b/src/components/Encryption.vue index c9726577..bd80fc10 100644 --- a/src/components/Encryption.vue +++ b/src/components/Encryption.vue @@ -93,8 +93,8 @@ export default { * are enabled */ mounted() { - this.fullDiskEncryptionEnabled = loadState('privacy', 'fullDiskEncryptionEnabled') === 1 - this.serverSideEncryptionEnabled = loadState('privacy', 'serverSideEncryptionEnabled') === 1 + this.fullDiskEncryptionEnabled = loadState('privacy', 'fullDiskEncryptionEnabled') + this.serverSideEncryptionEnabled = loadState('privacy', 'serverSideEncryptionEnabled') }, methods: { /**