浏览代码

Merge pull request #11402 from nextcloud/loadNotes

when resuming note directly after creating, url is not working anymore, thus we need a new one
Tobias Kaminsky 2 年之前
父节点
当前提交
10034e6bf9
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt

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

@@ -60,24 +60,24 @@ class TextEditorWebView : EditorWebView() {
         val editor = editorUtils.getEditor(user.get(), file.mimeType)
 
         if (editor != null && editor.id == "onlyoffice") {
-            getWebView().settings.userAgentString = generateOnlyOfficeUserAgent()
+            webView.settings.userAgentString = generateOnlyOfficeUserAgent()
         }
 
-        getWebView().addJavascriptInterface(MobileInterface(), "DirectEditingMobileInterface")
+        webView.addJavascriptInterface(MobileInterface(), "DirectEditingMobileInterface")
 
         if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
             WebSettingsCompat.setForceDarkStrategy(
-                getWebView().settings,
+                webView.settings,
                 WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
             )
         }
         if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) && PlatformThemeUtil.isDarkMode(this)) {
-            WebSettingsCompat.setForceDark(getWebView().settings, WebSettingsCompat.FORCE_DARK_ON)
+            WebSettingsCompat.setForceDark(webView.settings, WebSettingsCompat.FORCE_DARK_ON)
         }
 
-        getWebView().setDownloadListener { url, _, _, _, _ -> downloadFile(Uri.parse(url)) }
+        webView.setDownloadListener { url, _, _, _, _ -> downloadFile(Uri.parse(url)) }
 
-        loadUrl(intent.getStringExtra(ExternalSiteWebView.EXTRA_URL))
+        loadUrl(null)
     }
 
     override fun loadUrl(url: String?) {