Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 2 commits into from
May 13, 2026
+11 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e672b1
fix: use office user agent for all office direct editing editors
moodyjmz May 12, 2026
3573668
Merge branch 'master' into feature/eurooffice-direct-editing
moodyjmz May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/com/nextcloud/utils/EditorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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))
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
Loading