Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2019-12-09 16:29:22 +0300
committerDaniel Kesselberg <mail@danielkesselberg.de>2019-12-09 16:29:22 +0300
commit8f403b66d19011b1061430a9e82f1166c7bb7cd6 (patch)
tree1155ad6b521306b4e9d42b298f6ab806030b7c32 /apps/encryption
parent8bc4295cfad1ba65bad3c7c06af1f4a16b9bcba5 (diff)
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/AppInfo/Application.php2
-rw-r--r--apps/encryption/lib/Recovery.php2
2 files changed, 0 insertions, 4 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 {