浏览代码

Merge pull request #12752 from nextcloud/Bugfix/edit-folder-rich-docs

Bugfix editing folder description
Tobias Kaminsky 1 年之前
父节点
当前提交
77701eb1eb

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

@@ -77,7 +77,7 @@ class TextEditorWebView : EditorWebView() {
 
         webView.setDownloadListener { url, _, _, _, _ -> downloadFile(Uri.parse(url)) }
 
-        loadUrl(null)
+        loadUrl(intent.getStringExtra(EXTRA_URL))
     }
 
     override fun loadUrl(url: String?) {

+ 13 - 0
app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java

@@ -52,6 +52,8 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
     @Inject UserAccountManager accountManager;
     @Inject ViewThemeUtils viewThemeUtils;
 
+    private boolean isEditorWebviewLaunched = false;
+
     /**
      * Creates an empty fragment for previews.
      */
@@ -107,6 +109,16 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
         return view;
     }
 
+    @Override
+    public void onStart() {
+        if (isEditorWebviewLaunched && containerActivity instanceof FileDisplayActivity fileDisplayActivity) {
+            fileDisplayActivity.getSupportFragmentManager().popBackStack();
+            fileDisplayActivity.onRefresh();
+        }
+
+        super.onStart();
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -146,6 +158,7 @@ public class PreviewTextStringFragment extends PreviewTextFragment {
                 containerActivity.getFileOperationsHelper().openRichWorkspaceWithTextEditor(getFile(),
                                                                                             url,
                                                                                             getContext());
+                isEditorWebviewLaunched = true;
             } else {
                 DisplayUtils.showSnackMessage(getView(), "Error");
             }