Merge pull request #3796 from nextcloud/backport/3790/stable29

[stable29] fix: Avoid background fetch if not configured
nextcloud · Jun 26, 2024 · a8cbc60 · a8cbc60
2 parents 5020467 + 349cdc3
commit a8cbc60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/Backgroundjobs/ObtainCapabilities.php b/lib/Backgroundjobs/ObtainCapabilities.php
@@ -23,6 +23,7 @@
 
 namespace OCA\Richdocuments\Backgroundjobs;
 
+use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\Service\CapabilitiesService;
 use OCA\Richdocuments\Service\DiscoveryService;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -35,13 +36,18 @@ public function __construct(
 		private LoggerInterface $logger,
 		private CapabilitiesService $capabilitiesService,
 		private DiscoveryService $discoveryService,
+		private AppConfig $appConfig,
 	) {
 		parent::__construct($time);
 
 		$this->setInterval(60 * 60);
 	}
 
 	protected function run($argument) {
+		if (!$this->appConfig->getCollaboraUrlInternal()) {
+			return;
+		}
+
 		try {
 			$this->capabilitiesService->fetch();
 		} catch (\Exception $e) {

diff --git a/lib/Service/ConnectivityService.php b/lib/Service/ConnectivityService.php
@@ -54,7 +54,7 @@ public function testDiscovery(OutputInterface $output): void {
 
 	public function testCapabilities(OutputInterface $output): void {
 		$this->capabilitiesService->resetCache();
-		$this->capabilitiesService->fetch(true);
+		$this->capabilitiesService->fetch();
 		$output->writeln('<info>✓ Fetched /hosting/capabilities endpoint</info>');
 
 		if ($this->capabilitiesService->getCapabilities() === []) {