fix(encryption): Assume boolValue for commands

Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Author: cuppett

core/Command/Encryption/DecryptAll.php

@@ -9,7 +9,6 @@
 namespace OC\Core\Command\Encryption;
 
 use OCP\App\IAppManager;
-use OCP\Exceptions\AppConfigTypeConflictException;
 use OCP\IAppConfig;
 use OCP\IConfig;
 use Symfony\Component\Console\Command\Command;
@@ -92,16 +91,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
-		try {
-			$originallyEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
-		} catch (AppConfigTypeConflictException) {
-			$raw = $this->appConfig->getValueString('core', 'encryption_enabled', 'no');
-			$originallyEnabled = in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'on'], true);
-		}
+		$originallyEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
 		try {
 			if ($originallyEnabled) {
 				$output->write('Disable server side encryption... ');
-				$this->writeEncryptionEnabled(false);
+				$this->appConfig->setValueBool('core', 'encryption_enabled', false);
 				$output->writeln('done.');
 			} else {
 				$output->writeln('Server side encryption not enabled. Nothing to do.');
@@ -129,37 +123,29 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$output->writeln(' aborted.');
 					if ($originallyEnabled) {
 						$output->writeln('Server side encryption remains enabled');
-						$this->writeEncryptionEnabled(true);
+						$this->appConfig->setValueBool('core', 'encryption_enabled', true);
 					}
 				} elseif (($uid !== '') && $originallyEnabled) {
 					$output->writeln('Server side encryption remains enabled');
-					$this->writeEncryptionEnabled(true);
+					$this->appConfig->setValueBool('core', 'encryption_enabled', true);
 				}
 				$this->resetMaintenanceAndTrashbin();
 				return 0;
 			}
 			if ($originallyEnabled) {
 				$output->write('Enable server side encryption... ');
-				$this->writeEncryptionEnabled(true);
+				$this->appConfig->setValueBool('core', 'encryption_enabled', true);
 				$output->writeln('done.');
 			}
 			$output->writeln('aborted');
 			return 1;
 		} catch (\Exception $e) {
 			// enable server side encryption again if something went wrong
 			if ($originallyEnabled) {
-				$this->writeEncryptionEnabled(true);
+				$this->appConfig->setValueBool('core', 'encryption_enabled', true);
 			}
 			$this->resetMaintenanceAndTrashbin();
 			throw $e;
 		}
 	}
-
-	private function writeEncryptionEnabled(bool $enabled): void {
-		try {
-			$this->appConfig->setValueBool('core', 'encryption_enabled', $enabled);
-		} catch (AppConfigTypeConflictException) {
-			$this->appConfig->setValueString('core', 'encryption_enabled', $enabled ? 'yes' : 'no');
-		}
-	}
 }

core/Command/Encryption/Disable.php

@@ -9,7 +9,6 @@
  */
 namespace OC\Core\Command\Encryption;
 
-use OCP\Exceptions\AppConfigTypeConflictException;
 use OCP\IAppConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -32,21 +31,11 @@ protected function configure() {
 
 	#[\Override]
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		try {
-			$isEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
-		} catch (AppConfigTypeConflictException) {
-			$raw = $this->appConfig->getValueString('core', 'encryption_enabled', 'no');
-			$isEnabled = in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'on'], true);
-		}
-
+		$isEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
 		if (!$isEnabled) {
 			$output->writeln('Encryption is already disabled');
 		} else {
-			try {
-				$this->appConfig->setValueBool('core', 'encryption_enabled', false);
-			} catch (AppConfigTypeConflictException) {
-				$this->appConfig->setValueString('core', 'encryption_enabled', 'no');
-			}
+			$this->appConfig->setValueBool('core', 'encryption_enabled', false);
 			$output->writeln('<info>Encryption disabled</info>');
 		}
 		return 0;

core/Command/Encryption/Enable.php

@@ -10,7 +10,6 @@
 namespace OC\Core\Command\Encryption;
 
 use OCP\Encryption\IManager;
-use OCP\Exceptions\AppConfigTypeConflictException;
 use OCP\IAppConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -34,21 +33,11 @@ protected function configure() {
 
 	#[\Override]
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		try {
-			$isEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
-		} catch (AppConfigTypeConflictException) {
-			$raw = $this->appConfig->getValueString('core', 'encryption_enabled', 'no');
-			$isEnabled = in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'on'], true);
-		}
-
+		$isEnabled = $this->appConfig->getValueBool('core', 'encryption_enabled', false);
 		if ($isEnabled) {
 			$output->writeln('Encryption is already enabled');
 		} else {
-			try {
-				$this->appConfig->setValueBool('core', 'encryption_enabled', true);
-			} catch (AppConfigTypeConflictException) {
-				$this->appConfig->setValueString('core', 'encryption_enabled', 'yes');
-			}
+			$this->appConfig->setValueBool('core', 'encryption_enabled', true);
 			$output->writeln('<info>Encryption enabled</info>');
 		}
 		$output->writeln('');