Merge pull request #2598 from nextcloud/backport/2428/stable24

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/Capabilities.php b/lib/Capabilities.php
index c03317e3..b748f7bb 100644
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Richdocuments;
 
+use OCP\App\IAppManager;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCP\Capabilities\ICapability;
 use OCP\IL10N;
@@ -83,14 +84,17 @@ class Capabilities implements ICapability {
 	private $capabilitiesService;
 	/** @var PermissionManager */
 	private $permissionManager;
+	/** @var IAppManager */
+	private $appManager;
 
 	private $capabilities = null;
 
-	public function __construct(IL10N $l10n, AppConfig $config, CapabilitiesService $capabilitiesService, PermissionManager $permissionManager) {
+	public function __construct(IL10N $l10n, AppConfig $config, CapabilitiesService $capabilitiesService, PermissionManager $permissionManager, IAppManager $appManager) {
 		$this->l10n = $l10n;
 		$this->config = $config;
 		$this->capabilitiesService = $capabilitiesService;
 		$this->permissionManager = $permissionManager;
+		$this->appManager = $appManager;
 	}
 
 	public function getCapabilities() {
@@ -109,6 +113,10 @@ class Capabilities implements ICapability {
 				]));
 			}
 
+			if (!$this->appManager->isEnabledForUser('files_pdfviewer')) {
+				$filteredMimetypes[] = 'application/pdf';
+			}
+
 			$this->capabilities = [
 				'richdocuments' => [
 					'version' => \OC::$server->getAppManager()->getAppVersion('richdocuments'),