let user enable recovery key

1 files changed, 11 insertions, 11 deletions

diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
index 8caacbd19ca..417bf1433bf 100644
--- a/apps/encryption/settings/settings-personal.php
+++ b/apps/encryption/settings/settings-personal.php
@@ -16,38 +16,38 @@ $crypt = new \OCA\Encryption\Crypto\Crypt(
 	\OC::$server->getLogger(),
 	\OC::$server->getUserSession(),
 	\OC::$server->getConfig());
+
+$util = new \OCA\Encryption\Util(
+	new \OC\Files\View(),
+	$crypt,
+	\OC::$server->getLogger(),
+	\OC::$server->getUserSession(),
+	\OC::$server->getConfig());
+
 $keymanager = new \OCA\Encryption\KeyManager(
 	\OC::$server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID),
 	$crypt,
 	\OC::$server->getConfig(),
 	\OC::$server->getUserSession(),
 	$session,
-	\OC::$server->getLogger(), null);
+	\OC::$server->getLogger(), $util);
 
 $user = \OCP\User::getUser();
 
 $view = new \OC\Files\View('/');
 
-$util = new \OCA\Encryption\Util(
-	new \OC\Files\View(),
-	$crypt, $keymanager,
-	\OC::$server->getLogger(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getConfig());
+
 
 $privateKeySet = $session->isPrivateKeySet();
 // did we tried to initialize the keys for this session?
 $initialized = $session->getStatus();
 
 $recoveryAdminEnabled = \OC::$server->getConfig()->getAppValue('encryption', 'recoveryAdminEnabled');
-$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+$recoveryEnabledForUser = $util->isRecoveryEnabledForUser();
 
 $result = false;
 
 if ($recoveryAdminEnabled || !$privateKeySet) {
-
-	\OCP\Util::addscript('encryption', 'settings-personal');
-
 	$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
 	$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
 	$tmpl->assign('privateKeySet', $privateKeySet);