diff options
Diffstat (limited to 'apps/encryption/lib/Recovery.php')
| -rw-r--r-- | apps/encryption/lib/Recovery.php | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/apps/encryption/lib/Recovery.php b/apps/encryption/lib/Recovery.php index 17533e7b114..f9cdef53f13 100644 --- a/apps/encryption/lib/Recovery.php +++ b/apps/encryption/lib/Recovery.php @@ -47,10 +47,6 @@ class Recovery { */ protected $crypt; /** - * @var ISecureRandom - */ - private $random; - /** * @var KeyManager */ private $keyManager; @@ -59,10 +55,6 @@ class Recovery { */ private $config; /** - * @var IStorage - */ - private $keyStorage; - /** * @var View */ private $view; @@ -72,29 +64,23 @@ class Recovery { private $file; /** - * @param IUserSession $user + * @param IUserSession $userSession * @param Crypt $crypt - * @param ISecureRandom $random * @param KeyManager $keyManager * @param IConfig $config - * @param IStorage $keyStorage * @param IFile $file * @param View $view */ - public function __construct(IUserSession $user, + public function __construct(IUserSession $userSession, Crypt $crypt, - ISecureRandom $random, KeyManager $keyManager, IConfig $config, - IStorage $keyStorage, IFile $file, View $view) { - $this->user = ($user && $user->isLoggedIn()) ? $user->getUser() : false; + $this->user = ($userSession && $userSession->isLoggedIn()) ? $userSession->getUser() : false; $this->crypt = $crypt; - $this->random = $random; $this->keyManager = $keyManager; $this->config = $config; - $this->keyStorage = $keyStorage; $this->view = $view; $this->file = $file; } @@ -169,7 +155,7 @@ class Recovery { * @return bool */ public function isRecoveryEnabledForUser($user = '') { - $uid = empty($user) ? $this->user->getUID() : $user; + $uid = $user === '' ? $this->user->getUID() : $user; $recoveryMode = $this->config->getUserValue($uid, 'encryption', 'recoveryEnabled', |