Merge pull request #24532 from nextcloud/backport/24409/stable20

[stable20] Also run repair steps when encryption is disabled but a legacy key is present

Author: rullzer

lib/private/Repair/NC20/EncryptionLegacyCipher.php

@@ -58,7 +58,8 @@ public function run(IOutput $output): void {
 			return;
 		}
 
-		if ($this->manager->isEnabled()) {
+		$masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
+		if ($this->manager->isEnabled() || !empty($masterKeyId)) {
 			if ($this->config->getSystemValue('encryption.legacy_format_support', '') === '') {
 				$this->config->setSystemValue('encryption.legacy_format_support', true);
 			}

lib/private/Repair/NC20/EncryptionMigration.php

@@ -58,7 +58,8 @@ public function run(IOutput $output): void {
 			return;
 		}
 
-		if ($this->manager->isEnabled()) {
+		$masterKeyId = $this->config->getAppValue('encryption', 'masterKeyId');
+		if ($this->manager->isEnabled() || !empty($masterKeyId)) {
 			if ($this->config->getSystemValue('encryption.key_storage_migrated', '') === '') {
 				$this->config->setSystemValue('encryption.key_storage_migrated', false);
 			}