Merge pull request #18300 from nextcloud/bug/18295/recovery-initialization

Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must …

3 files changed, 0 insertions, 6 deletions

diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index 730b0afc0eb..6d7c00687e3 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -167,10 +167,8 @@ class Application extends \OCP\AppFramework\App {
 				return new Recovery(
 					$server->getUserSession(),
 					$c->query('Crypt'),
-					$server->getSecureRandom(),
 					$c->query('KeyManager'),
 					$server->getConfig(),
-					$server->getEncryptionKeyStorage(),
 					$server->getEncryptionFilesHelper(),
 					new View());
 			});
diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php
index 8f50a3a5d28..d586d330237 100644
--- a/apps/encryption/lib/Recovery.php
+++ b/apps/encryption/lib/Recovery.php
@@ -30,12 +30,10 @@ namespace OCA\Encryption;
 use OC\Files\View;
 use OCA\Encryption\Crypto\Crypt;
 use OCP\Encryption\IFile;
-use OCP\Encryption\Keys\IStorage;
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\PreConditionNotMetException;
-use OCP\Security\ISecureRandom;
 
 class Recovery {
 
diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php
index 0eba440ae4d..c374b3ff8bf 100644
--- a/apps/settings/lib/Controller/ChangePasswordController.php
+++ b/apps/settings/lib/Controller/ChangePasswordController.php
@@ -215,10 +215,8 @@ class ChangePasswordController extends Controller {
 			$recovery = new \OCA\Encryption\Recovery(
 				\OC::$server->getUserSession(),
 				$crypt,
-				\OC::$server->getSecureRandom(),
 				$keyManager,
 				\OC::$server->getConfig(),
-				$keyStorage,
 				\OC::$server->getEncryptionFilesHelper(),
 				new \OC\Files\View());
 			$recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();