From 33953affa6ef6a1d298922bd4af16ce7ed338da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 22 Mar 2019 09:54:54 +0100
Subject: [PATCH] Make import dependent on version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/AppInfo/Application.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 99ba36267..de06ffabf 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -24,7 +24,6 @@
 namespace OCA\Deck\AppInfo;
 
 use OCA\Deck\Activity\CommentEventHandler;
-use OCA\Deck\Collaboration\Resources\ResourceProvider;
 use OCA\Deck\Db\Acl;
 use OCA\Deck\Db\AclMapper;
 use OCA\Deck\Db\AssignedUsersMapper;
@@ -33,7 +32,6 @@ use OCA\Deck\Middleware\ExceptionMiddleware;
 use OCA\Deck\Notification\Notifier;
 use OCP\AppFramework\App;
 use OCA\Deck\Middleware\SharingMiddleware;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Comments\CommentsEntityEvent;
 use OCP\IGroup;
@@ -107,6 +105,9 @@ class Application extends App {
 
 	}
 
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
 	public function registerNavigationEntry() {
 		$container = $this->getContainer();
 		$container->query(INavigationManager::class)->add(function() use ($container) {
@@ -131,6 +132,9 @@ class Application extends App {
 		});
 	}
 
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
 	public function registerCommentsEntity() {
 		$this->getContainer()->getServer()->getEventDispatcher()->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
 			$event->addEntityCollection('deckCard', function($name) {
@@ -147,12 +151,18 @@ class Application extends App {
 		$this->registerCommentsEventHandler();
 	}
 
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
 	protected function registerCommentsEventHandler() {
 		$this->getContainer()->getServer()->getCommentsManager()->registerEventHandler(function () {
 			return $this->getContainer()->query(CommentEventHandler::class);
 		});
 	}
 
+	/**
+	 * @throws \OCP\AppFramework\QueryException
+	 */
 	protected function registerCollaborationResources() {
 		$version = \OC_Util::getVersion()[0];
 		if ($version < 16) {
@@ -164,7 +174,7 @@ class Application extends App {
 		 */
 		/** @var IManager $resourceManager */
 		$resourceManager = $this->getContainer()->query(IManager::class);
-		$resourceManager->registerResourceProvider(ResourceProvider::class);
+		$resourceManager->registerResourceProvider(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
 		\OC::$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
 			\OCP\Util::addScript('deck', 'build/collections');
 		});