Merge pull request #3221 from nextcloud/backport/3200/stable25

[stable25] [stable27] fix: Mobile support shall be enabled by default
nextcloud · Oct 11, 2023 · 67093dc · 67093dc
2 parents 0137bea + 882d4e1
commit 67093dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/AppConfig.php b/lib/AppConfig.php
@@ -59,10 +59,10 @@ public function getAppNamespace($key) {
 	/**
 	 * Get a value by key
 	 * @param string $key
+	 * @param string|null $defaultValue The fallback value if no configuration and global fallback was found.
 	 * @return string
 	 */
-	public function getAppValue($key) {
-		$defaultValue = null;
+	public function getAppValue($key, $defaultValue = null) {
 		if (array_key_exists($key, $this->defaults)) {
 			$defaultValue = $this->defaults[$key];
 		}

diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -127,7 +127,7 @@ public function getCapabilities() {
 					'mimetypes' => array_values($filteredMimetypes),
 					'mimetypesNoDefaultOpen' => array_values($optionalMimetypes),
 					'collabora' => $collaboraCapabilities,
-					'direct_editing' => isset($collaboraCapabilities['hasMobileSupport']) && $this->config->getAppValue('mobile_editing') ?: false,
+					'direct_editing' => ($collaboraCapabilities['hasMobileSupport'] ?? false) && $this->config->getAppValue('mobile_editing', 'yes') === 'yes',
 					'templates' => isset($collaboraCapabilities['hasTemplateSaveAs']) || isset($collaboraCapabilities['hasTemplateSource']) ?: false,
 					'productName' => $this->capabilitiesService->getProductName(),
 					'config' => [