Merge pull request #488 from nextcloud/bugfix/427/encryption_not_saved

Fixes regression that prevented you from toggling the encryption flag
nextcloud · Aug 24, 2020 · fb089b4 · fb089b4
2 parents 845360c + 1716b83
commit fb089b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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: {
 		/**