From 6bd83c04227173ec97c08b3ca8e92812c8342f7e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 31 Mar 2015 14:26:38 +0200
Subject: [PATCH] register settings and hooks only once

---
 apps/encryption/appinfo/app.php         | 2 ++
 apps/encryption/appinfo/application.php | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
index 8573f8d605..240a172671 100644
--- a/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@ -23,3 +23,5 @@ namespace OCA\Encryption\AppInfo;
 
 $app = new Application();
 $app->registerEncryptionModule();
+$app->registerHooks();
+$app->registerSettings();
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 30962e83ad..e8f10798bb 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -55,9 +55,6 @@ class Application extends \OCP\AppFramework\App {
 		$this->encryptionManager = \OC::$server->getEncryptionManager();
 		$this->config = \OC::$server->getConfig();
 		$this->registerServices();
-//		$this->registerEncryptionModule();
-		$this->registerHooks();
-		$this->registerSettings();
 	}
 
 	/**
@@ -178,11 +175,6 @@ class Application extends \OCP\AppFramework\App {
 	 *
 	 */
 	public function registerSettings() {
-
-//		script('encryption', 'encryption');
-//		script('encryption', 'detect-migration');
-
-
 		// Register settings scripts
 		App::registerAdmin('encryption', 'settings/settings-admin');
 		App::registerPersonal('encryption', 'settings/settings-personal');