From a5488c01de7f8caffd9a4972bfb5bd321f271d4b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 8 Jul 2020 12:23:59 +0200 Subject: [PATCH] Move contactsinteraction to bootstrap mechanism Signed-off-by: Morris Jobke --- apps/comments/appinfo/app.php | 25 ------------------ apps/contactsinteraction/appinfo/app.php | 26 ------------------- .../lib/AppInfo/Application.php | 15 ++++++----- 3 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 apps/comments/appinfo/app.php delete mode 100644 apps/contactsinteraction/appinfo/app.php diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php deleted file mode 100644 index c12c7345d8..0000000000 --- a/apps/comments/appinfo/app.php +++ /dev/null @@ -1,25 +0,0 @@ - - * - * @author John Molakvoæ (skjnldsv) - * @author Vincent Petry - * - * @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 . - * - */ - -\OC::$server->query(\OCA\Comments\AppInfo\Application::class); diff --git a/apps/contactsinteraction/appinfo/app.php b/apps/contactsinteraction/appinfo/app.php deleted file mode 100644 index 7bc55c958d..0000000000 --- a/apps/contactsinteraction/appinfo/app.php +++ /dev/null @@ -1,26 +0,0 @@ - - * - * @author 2020 Christoph Wurst - * - * @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 . - */ - -\OC::$server->query(\OCA\ContactsInteraction\AppInfo\Application::class); diff --git a/apps/contactsinteraction/lib/AppInfo/Application.php b/apps/contactsinteraction/lib/AppInfo/Application.php index a3cb74f408..8d0e2fd4e7 100644 --- a/apps/contactsinteraction/lib/AppInfo/Application.php +++ b/apps/contactsinteraction/lib/AppInfo/Application.php @@ -27,19 +27,22 @@ namespace OCA\ContactsInteraction\AppInfo; use OCA\ContactsInteraction\Listeners\ContactInteractionListener; use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\Contacts\Events\ContactInteractedWithEvent; -use OCP\EventDispatcher\IEventDispatcher; -class Application extends App { +class Application extends App implements IBootstrap { public const APP_ID = 'contactsinteraction'; public function __construct() { parent::__construct(self::APP_ID); - - $this->registerListeners($this->getContainer()->query(IEventDispatcher::class)); } - private function registerListeners(IEventDispatcher $dispatcher): void { - $dispatcher->addServiceListener(ContactInteractedWithEvent::class, ContactInteractionListener::class); + public function register(IRegistrationContext $context): void { + $context->registerEventListener(ContactInteractedWithEvent::class, ContactInteractionListener::class); + } + + public function boot(IBootContext $context): void { } }