Move encryption from app.php to IBootstrap

Signed-off-by: Morris Jobke <[email protected]>
nextcloud · Nov 10, 2020 · 420a3c3 · 420a3c3
1 parent f23c216
commit 420a3c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 39 deletions.
diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
@@ -44,13 +44,16 @@
 use OCA\Encryption\Session;
 use OCA\Encryption\Users\Setup;
 use OCA\Encryption\Util;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Encryption\IManager;
 use OCP\IConfig;
 use OCP\IServerContainer;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\QuestionHelper;
 
-class Application extends \OCP\AppFramework\App {
+class Application extends \OCP\AppFramework\App implements IBootstrap {
 
 	/** @var IManager */
 	private $encryptionManager;
@@ -65,6 +68,12 @@ public function __construct($urlParams = []) {
 		$this->encryptionManager = \OC::$server->getEncryptionManager();
 		$this->config = \OC::$server->getConfig();
 		$this->registerServices();
+		if ($this->encryptionManager->isReady()) {
+			$app->registerEncryptionModule();
+			$app->registerHooks();
+			$app->setUp();
+		}
+		\OCP\Util::addScript('encryption', 'encryption');
 	}
 
 	public function setUp() {
@@ -263,4 +272,10 @@ public function registerServices() {
 		}
 		);
 	}
+
+	public function register(IRegistrationContext $context): void {
+	}
+
+	public function boot(IBootContext $context): void {
+	}
 }