fix: Skip more collabora specific logic if no capabilities are there

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Nov 29, 2024 · ef1ab86 · ef1ab86
1 parent aad124c
commit ef1ab86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/Service/ConnectivityService.php b/lib/Service/ConnectivityService.php
@@ -46,6 +46,9 @@ public function hasCapabilities() : bool {
 	}
 
 	public function testCapabilities(OutputInterface $output): void {
+		if (!$this->hasCapabilities()) {
+			return;
+		}
 		$this->capabilitiesService->resetCache();
 		$this->capabilitiesService->fetch();
 		$output->writeln('<info>✓ Fetched /hosting/capabilities endpoint</info>');

diff --git a/src/view/Office.vue b/src/view/Office.vue
@@ -202,13 +202,16 @@ export default {
 	},
 	computed: {
 		showIframe() {
-			return this.loading >= LOADING_STATE.FRAME_READY || this.debug
+			return this.loading >= LOADING_STATE.FRAME_READY || this.debug || this.isPlainWopi
 		},
 		iframeTitle() {
 			return loadState('richdocuments', 'productName', 'Nextcloud Office')
 		},
+		isPlainWopi() {
+			return getCapabilities().collabora.length === 0
+		},
 		showLoadingIndicator() {
-			return this.loading < LOADING_STATE.FRAME_READY
+			return this.loading < LOADING_STATE.FRAME_READY && !this.isPlainWopi
 		},
 		errorMessage() {
 			switch (parseInt(this.error)) {