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

…ation Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must …
nextcloud · Dec 9, 2019 · 3e72094 · 3e72094
2 parents 0360ab4 + 8f403b6
commit 3e72094
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
@@ -167,10 +167,8 @@ function (IAppContainer $c) {
 				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
@@ -30,12 +30,10 @@
 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
@@ -215,10 +215,8 @@ public function changeUserPassword(string $username = null, string $password = n
 			$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();