fix setting up encryption section

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

2 files changed, 16 insertions, 78 deletions

diff --git a/apps/encryption/lib/Settings/PersonalSection.php b/apps/encryption/lib/Settings/PersonalSection.php
index 70e826a6ea1..fd25d25ef8f 100644
--- a/apps/encryption/lib/Settings/PersonalSection.php
+++ b/apps/encryption/lib/Settings/PersonalSection.php
@@ -29,6 +29,7 @@ use OCA\Encryption\Session;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
+use OCP\IUserSession;
 use OCP\Settings\IIconSection;
 
 class PersonalSection implements IIconSection {
@@ -43,13 +44,23 @@ class PersonalSection implements IIconSection {
 	private $config;
 	/** @var Session */
 	private $session;
+	/** @var IUserSession */
+	private $userSession;
 
-	public function __construct(IURLGenerator $urlGenerator, IL10N $l, Application $app, IConfig $config, Session $session) {
+	public function __construct(
+		IURLGenerator $urlGenerator,
+		IL10N $l,
+		Application $app,
+		IConfig $config,
+		Session $session,
+		IUserSession $userSession
+	) {
 		$this->urlGenerator = $urlGenerator;
 		$this->l = $l;
 		$this->app = $app;
 		$this->config = $config;
 		$this->session = $session;
+		$this->userSession = $userSession;
 	}
 
 	/**
@@ -71,10 +82,13 @@ class PersonalSection implements IIconSection {
 	 * @since 9.1
 	 */
 	public function getID() {
+		// we need to return the proper id while installing/upgrading the app
+		$loggedIn = $this->userSession->isLoggedIn();
+
 		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
 		$privateKeySet = $this->session->isPrivateKeySet();
 
-		if (!$recoveryAdminEnabled && $privateKeySet) {
+		if ($loggedIn && !$recoveryAdminEnabled && $privateKeySet) {
 			return null;
 		}
 		return 'encryption';
diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
deleted file mode 100644
index 66083408881..00000000000
--- a/apps/encryption/settings/settings-personal.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-$session = new \OCA\Encryption\Session(\OC::$server->getSession());
-$userSession = \OC::$server->getUserSession();
-
-$template = new OCP\Template('encryption', 'settings-personal');
-$crypt = new \OCA\Encryption\Crypto\Crypt(
-	\OC::$server->getLogger(),
-	$userSession,
-	\OC::$server->getConfig(),
-	\OC::$server->getL10N('encryption'));
-
-$util = new \OCA\Encryption\Util(
-	new \OC\Files\View(),
-	$crypt,
-	\OC::$server->getLogger(),
-	$userSession,
-	\OC::$server->getConfig(),
-	\OC::$server->getUserManager());
-
-$keyManager = new \OCA\Encryption\KeyManager(
-	\OC::$server->getEncryptionKeyStorage(),
-	$crypt,
-	\OC::$server->getConfig(),
-	$userSession,
-	$session,
-	\OC::$server->getLogger(), $util);
-
-$user = $userSession->getUser()->getUID();
-
-$view = new \OC\Files\View('/');
-
-
-
-$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->isRecoveryEnabledForUser($user);
-
-$result = false;
-
-if ($recoveryAdminEnabled || !$privateKeySet) {
-	$template->assign('recoveryEnabled', $recoveryAdminEnabled);
-	$template->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
-	$template->assign('privateKeySet', $privateKeySet);
-	$template->assign('initialized', $initialized);
-
-	$result = $template->fetchPage();
-}
-
-return $result;
-