register settings and hooks only once

diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
index 8573f8d605d0f4c7ba124483fa5d912b2bb93b2a..240a1726715b3b839b38cd525a027bad4405c276 100644 (file)
--- 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 30962e83adacc7af32eb0ab36b88efb5c664cacf..e8f10798bb479ff7fa9f5649a81f192cf8a31f14 100644 (file)
--- 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');