Merge pull request #17036 from nextcloud/feature/eurooffice-direct-editing

fix: use office user agent for all office direct editing editors

Author: tobiasKaminsky

app/src/main/java/com/nextcloud/utils/EditorUtils.kt

@@ -27,4 +27,10 @@ class EditorUtils @Inject constructor(private val arbitraryDataProvider: Arbitra
     }
 
     fun isEditorAvailable(user: User?, mimeType: String?): Boolean = getEditor(user, mimeType) != null
+
+    fun usesOfficeUserAgent(editor: Editor?): Boolean = editor?.id in OFFICE_EDITOR_IDS
+
+    companion object {
+        private val OFFICE_EDITOR_IDS = setOf("onlyoffice", "eurooffice")
+    }
 }

app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt

@@ -45,8 +45,8 @@ class TextEditorWebView : EditorWebView() {
 
         val editor = editorUtils.getEditor(user.get(), file?.mimeType)
 
-        if (editor != null && editor.id == "onlyoffice") {
-            webView.settings.userAgentString = generateOnlyOfficeUserAgent()
+        if (editorUtils.usesOfficeUserAgent(editor)) {
+            webView.settings.userAgentString = generateOfficeUserAgent()
         }
 
         webView.addJavascriptInterface(MobileInterface(), "DirectEditingMobileInterface")
@@ -72,8 +72,8 @@ class TextEditorWebView : EditorWebView() {
         }
     }
 
-    private fun generateOnlyOfficeUserAgent(): String {
-        val userAgent = applicationContext.resources.getString(R.string.only_office_user_agent)
+    private fun generateOfficeUserAgent(): String {
+        val userAgent = applicationContext.resources.getString(R.string.office_user_agent)
 
         return String.format(userAgent, deviceInfo.androidVersion, appInfo.getAppVersion(this))
     }

app/src/main/res/values/setup.xml

@@ -24,7 +24,7 @@
     <string name="data_folder">nextcloud</string>
     <string name="default_display_name_for_root_folder">Nextcloud</string>
     <string name="nextcloud_user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s%2$s</string>
-    <string name="only_office_user_agent">Mozilla/5.0 (Android %1$s) Mobile Nextcloud-android/%2$s</string>
+    <string name="office_user_agent">Mozilla/5.0 (Android %1$s) Mobile Nextcloud-android/%2$s</string>
     <string name="name_for_branded_user_agent"></string>
 
     <!-- URLs and flags related -->