Skip to content

fix(text-editor-web-view): user no such element #17324

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

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −26
Open

fix(text-editor-web-view): user no such element #17324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 22 additions & 26 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
@@ -1,6 +1,7 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
* SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
* SPDX-FileCopyrightText: 2019 Nextcloud GmbH
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
Expand All @@ -14,11 +15,9 @@ import androidx.webkit.WebViewFeature
import com.nextcloud.android.common.ui.util.PlatformThemeUtil
import com.nextcloud.client.appinfo.AppInfo
import com.nextcloud.client.device.DeviceInfo
import com.nextcloud.utils.EditorUtils
import com.owncloud.android.R
import com.owncloud.android.ui.asynctasks.TextEditorLoadUrlTask
import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.theme.ThemeUtils
import javax.inject.Inject

class TextEditorWebView : EditorWebView() {
Expand All @@ -28,12 +27,6 @@ class TextEditorWebView : EditorWebView() {
@Inject
lateinit var deviceInfo: DeviceInfo

@Inject
lateinit var themeUtils: ThemeUtils

@Inject
lateinit var editorUtils: EditorUtils

@SuppressLint("AddJavascriptInterface") // suppress warning as webview is only used > Lollipop
override fun postOnCreate() {
super.postOnCreate()
Expand All @@ -43,38 +36,41 @@ class TextEditorWebView : EditorWebView() {
finish()
}

val editor = editorUtils.getEditor(user.get(), file?.mimeType)
user.ifPresent {
val editor = editorUtils.getEditor(it, file?.mimeType)

if (editorUtils.usesOfficeUserAgent(editor)) {
webView.settings.userAgentString = generateOfficeUserAgent()
}
if (editorUtils.usesOfficeUserAgent(editor)) {
webView.settings.userAgentString = generateOfficeUserAgent()
}

webView.addJavascriptInterface(MobileInterface(), "DirectEditingMobileInterface")
webView.addJavascriptInterface(MobileInterface(), "DirectEditingMobileInterface")

if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
WebSettingsCompat.setForceDarkStrategy(
webView.settings,
WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
)
}
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) && PlatformThemeUtil.isDarkMode(this)) {
WebSettingsCompat.setForceDark(webView.settings, WebSettingsCompat.FORCE_DARK_ON)
}
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
WebSettingsCompat.setForceDarkStrategy(
webView.settings,
WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
)
}

webView.setDownloadListener { url, _, _, _, _ -> downloadFile(url.toUri(), fileName) }
if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) && PlatformThemeUtil.isDarkMode(this)) {
WebSettingsCompat.setForceDark(webView.settings, WebSettingsCompat.FORCE_DARK_ON)
}

loadUrl(intent.getStringExtra(EXTRA_URL))
webView.setDownloadListener { url, _, _, _, _ -> downloadFile(url.toUri(), fileName) }
loadUrl(intent.getStringExtra(EXTRA_URL))
}
}

override fun loadUrl(url: String?) {
if (url.isNullOrEmpty()) {
TextEditorLoadUrlTask(this, user.get(), file, editorUtils).execute()
user.ifPresent {
TextEditorLoadUrlTask(this, it, file, editorUtils).execute()
}
}
}

private fun generateOfficeUserAgent(): String {
val userAgent = applicationContext.resources.getString(R.string.office_user_agent)

return String.format(userAgent, deviceInfo.androidVersion, appInfo.getAppVersion(this))
}
}
Loading