adapt encryption

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

apps/encryption/appinfo/app.php

@@ -31,5 +31,4 @@ $app = new Application([], $encryptionSystemReady);
 if ($encryptionSystemReady) {
 	$app->registerEncryptionModule();
 	$app->registerHooks();
-	$app->registerSettings();
 }

apps/encryption/appinfo/info.xml

@@ -19,7 +19,7 @@
 		<user>user-encryption</user>
 		<admin>admin-encryption</admin>
 	</documentation>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<types>
 		<filesystem/>
 	</types>
@@ -29,6 +29,8 @@
 	</dependencies>
 	<settings>
 		<admin>OCA\Encryption\Settings\Admin</admin>
+		<personal>OCA\Encryption\Settings\Personal</personal>
+		<personal-section>OCA\Encryption\Settings\PersonalSection</personal-section>
 	</settings>
 	<commands>
 		<command>OCA\Encryption\Command\EnableMasterKey</command>

apps/encryption/lib/AppInfo/Application.php

@@ -266,9 +266,4 @@ class Application extends \OCP\AppFramework\App {
 		);
 
 	}
-
-	public function registerSettings() {
-		// Register settings scripts
-		App::registerPersonal('encryption', 'settings/settings-personal');
-	}
 }

apps/encryption/lib/Settings/Personal.php

@@ -0,0 +1,95 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption\Settings;
+
+
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\IUserSession;
+use OCP\Settings\ISettings;
+
+class Personal implements  ISettings {
+
+	/** @var IConfig */
+	private $config;
+	/** @var Session */
+	private $session;
+	/** @var Util */
+	private $util;
+	/** @var IUserSession */
+	private $userSession;
+
+	public function __construct(IConfig $config, Session $session, Util $util, IUserSession $userSession) {
+		$this->config = $config;
+		$this->session = $session;
+		$this->util = $util;
+		$this->userSession = $userSession;
+	}
+
+	/**
+	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+	 * @since 9.1
+	 */
+	public function getForm() {
+		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
+		$privateKeySet = $this->session->isPrivateKeySet();
+
+		if (!$recoveryAdminEnabled && $privateKeySet) {
+			return new TemplateResponse('settings', 'settings/empty', [], '');
+		}
+
+		$userId = $this->userSession->getUser()->getUID();
+		$recoveryEnabledForUser = $this->util->isRecoveryEnabledForUser($userId);
+
+		$parameters = [
+			'recoveryEnabled' => $recoveryAdminEnabled,
+			'recoveryEnabledForUser' => $recoveryEnabledForUser,
+			'privateKeySet' => $privateKeySet,
+			'initialized' => $this->session->getStatus(),
+		];
+		return new TemplateResponse('encryption', 'settings-personal', $parameters, '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 * @since 9.1
+	 */
+	public function getSection() {
+		return 'encryption';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * E.g.: 70
+	 * @since 9.1
+	 */
+	public function getPriority() {
+		return 10;
+	}
+}

apps/encryption/lib/Settings/PersonalSection.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption\Settings;
+
+
+use OCA\Encryption\AppInfo\Application;
+use OCA\Encryption\Session;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class PersonalSection implements IIconSection {
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+	/** @var IL10N */
+	private $l;
+	/** @var Application */
+	private $app;
+	/** @var IConfig */
+	private $config;
+	/** @var Session */
+	private $session;
+
+	public function __construct(IURLGenerator $urlGenerator, IL10N $l, Application $app, IConfig $config, Session $session) {
+		$this->urlGenerator = $urlGenerator;
+		$this->l = $l;
+		$this->app = $app;
+		$this->config = $config;
+		$this->session = $session;
+	}
+
+	/**
+	 * returns the relative path to an 16*16 icon describing the section.
+	 * e.g. '/core/img/places/files.svg'
+	 *
+	 * @returns string
+	 * @since 12
+	 */
+	public function getIcon() {
+		return $this->urlGenerator->imagePath('settings', 'password.svg');
+	}
+
+	/**
+	 * returns the ID of the section. It is supposed to be a lower case string,
+	 * e.g. 'ldap'
+	 *
+	 * @returns string
+	 * @since 9.1
+	 */
+	public function getID() {
+		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled');
+		$privateKeySet = $this->session->isPrivateKeySet();
+
+		if (!$recoveryAdminEnabled && $privateKeySet) {
+			return null;
+		}
+		return 'encryption';
+	}
+
+	/**
+	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+	 * integration'. Use the L10N service to translate it.
+	 *
+	 * @return string
+	 * @since 9.1
+	 */
+	public function getName() {
+		return $this->l->t('Encryption');
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the settings navigation. The sections are arranged in ascending order of
+	 * the priority values. It is required to return a value between 0 and 99.
+	 *
+	 * E.g.: 70
+	 * @since 9.1
+	 */
+	public function getPriority() {
+		return 10;
+	}
+}