From f1fa91fa74551c005fda8f10e38491652da76424 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 13 Jul 2020 22:14:11 +0200 Subject: [PATCH] Fix event register method for files_sharing event Signed-off-by: Morris Jobke --- lib/AppInfo/Application.php | 8 +++++++- .../FilesSharingLoadAdditionalScriptsListener.php | 3 --- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 10292e2920c..eba3d9a9957 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -35,6 +35,7 @@ use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\DirectEditing\RegisterDirectEditorEvent; +use OCP\EventDispatcher\Event; class Application extends App implements IBootstrap { const APP_NAME = 'text'; @@ -46,11 +47,16 @@ public function __construct(array $params = []) { public function register(IRegistrationContext $context): void { $context->registerEventListener(RegisterDirectEditorEvent::class, RegisterDirectEditorEventListener::class); $context->registerEventListener(LoadViewer::class, LoadViewerListener::class); - $context->registerEventListener('OCA\Files_Sharing::loadAdditionalScripts', FilesSharingLoadAdditionalScriptsListener::class); $context->registerEventListener(LoadAdditionalScriptsEvent::class, FilesLoadAdditionalScriptsListener::class); } public function boot(IBootContext $context): void { + // TODO migrate this to the new IEventDispatcher + $container = $context->getAppContainer(); + $context->getServerContainer()->getEventDispatcher()->addListener('OCA\Files_Sharing::loadAdditionalScripts', function() use ($container) { + $listener = $container->query(FilesSharingLoadAdditionalScriptsListener::class); + $listener->handle(new Event()); + }); } } diff --git a/lib/Listeners/FilesSharingLoadAdditionalScriptsListener.php b/lib/Listeners/FilesSharingLoadAdditionalScriptsListener.php index bf097ddb4c4..9af5bd5bb31 100644 --- a/lib/Listeners/FilesSharingLoadAdditionalScriptsListener.php +++ b/lib/Listeners/FilesSharingLoadAdditionalScriptsListener.php @@ -47,9 +47,6 @@ public function __construct(IConfig $config, IInitialStateService $initialStateS } public function handle(Event $event): void { - if (!$this->userSession->isLoggedIn()) { - return; - } \OCP\Util::addScript('text', 'public'); \OCP\Util::addStyle('text', 'icons');