Fix settings

diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php
index a34d30d1de58ead5341cb7f7a71083fd147ba5b5..36e9c532bbdf98bf0cbf5a3586620070787a7948 100644 (file)
--- a/apps/encryption/settings/settings-admin.php
+++ b/apps/encryption/settings/settings-admin.php
@@ -6,16 +6,16 @@
  * See the COPYING-README file.
  */
 
-use OCA\Encryption\KeyManager;
-
 \OC_Util::checkAdminUser();
 
 $tmpl = new OCP\Template('encryption', 'settings-admin');
 
 // Check if an adminRecovery account is enabled for recovering files after lost pwd
 $recoveryAdminEnabled = \OC::$server->getConfig()->getAppValue('encryption', 'recoveryAdminEnabled', '0');
+$session = new \OCA\Encryption\Session(\OC::$server->getSession());
+
 
 $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
-$tmpl->assign('initStatus', KeyManager::$session->get('initStatus'));
+$tmpl->assign('initStatus', $session->getStatus());
 
 return $tmpl->fetchPage();

diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
index 83594b8467e52eeaaaec3e9a5d877a998cc62f64..a4173dbd40f1837e43b031e58889bbdfae6675b4 100644 (file)
--- a/apps/encryption/settings/settings-personal.php
+++ b/apps/encryption/settings/settings-personal.php
@@ -22,7 +22,7 @@ $keymanager = new \OCA\Encryption\KeyManager(
        \OC::$server->getConfig(),
        \OC::$server->getUserSession(),
        $session,
-       \OC::$server->getLogger());
+       \OC::$server->getLogger(), null);
 
 $user = \OCP\User::getUser();