ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #991 from nextcloud/bugfix/980/use-isavailable

Browse Source 
using fulltextsearchmanager::isAvailable()
This commit is contained in:
Julius Härtl
2019-04-17 14:44:02 +02:00
committed by GitHub
parent 10bda90afb a8472c650a
commit 942310b093
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/AppInfo/Application.php
View File

@@ -36,6 +36,7 @@ use OCP\AppFramework\App;
use OCA\Deck\Middleware\SharingMiddleware; use OCA\Deck\Middleware\SharingMiddleware;
use OCP\Collaboration\Resources\IManager; use OCP\Collaboration\Resources\IManager;
use OCP\Comments\CommentsEntityEvent; use OCP\Comments\CommentsEntityEvent;
use OCP\FullTextSearch\IFullTextSearchManager;
use OCP\IGroup; use OCP\IGroup;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager; use OCP\IUserManager;
@@ -50,6 +51,9 @@ class Application extends App {
/** @var FullTextSearchService */ /** @var FullTextSearchService */
private $fullTextSearchService; private $fullTextSearchService;
/** @var IFullTextSearchManager */
private $fullTextSearchManager;
/** /**
* Application constructor. * Application constructor.
@@ -191,17 +195,22 @@ class Application extends App {
} }
public function registerFullTextSearch() { public function registerFullTextSearch() {
if (Util::getVersion()[0] < 16 || !\OC::$server->getAppManager()->isEnabledForUser('fulltextsearch')) { if (Util::getVersion()[0] < 16) {
return; return;
} }
$c = $this->getContainer(); $c = $this->getContainer();
try { try {
$this->fullTextSearchService = $c->query(FullTextSearchService::class); $this->fullTextSearchService = $c->query(FullTextSearchService::class);
$this->fullTextSearchManager = $c->query(IFullTextSearchManager::class);
} catch (Exception $e) { } catch (Exception $e) {
return; return;
} }
if (!$this->fullTextSearchManager->isAvailable()) {
return;
}
$eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher = \OC::$server->getEventDispatcher();
$eventDispatcher->addListener( $eventDispatcher->addListener(
'\OCA\Deck\Card::onCreate', function(GenericEvent $e) { '\OCA\Deck\Card::onCreate', function(GenericEvent $e) {