opensourcemirror
/
nextcloud-android
mirror of https://github.com/nextcloud/android.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Bugfix editing folder description
This commit is contained in:
Tobias Kaminsky 2024-04-03 09:51:58 +02:00 committed by GitHub
parent 0aae345ad9 ee0b1cc222
commit 77701eb1eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java
View File

@ -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");
}