aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/encryption/appinfo/app.php2
-rw-r--r--apps/encryption/appinfo/application.php8
2 files changed, 2 insertions, 8 deletions
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
index 8573f8d605d..240a1726715 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 30962e83ada..e8f10798bb4 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');