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

using fulltextsearchmanager::isAvailable()
This commit is contained in:
Julius Härtl
2019-04-17 14:44:02 +02:00
committed by GitHub

View File

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