Skip to content

fix(text-editor): close on back press #17822

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
Open

fix(text-editor): close on back press #17822

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
17 changes: 17 additions & 0 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 @@ -11,6 +11,7 @@ package com.owncloud.android.ui.activity
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import androidx.activity.addCallback
import androidx.core.net.toUri
import androidx.webkit.WebSettingsCompat
import androidx.webkit.WebViewFeature
Expand Down Expand Up @@ -43,6 +44,10 @@ class TextEditorWebView : EditorWebView() {
context.startActivity(it)
}
}

private const val CLICK_TEXT_CLOSE_BUTTON_SCRIPT =
"(function() { const button = document.querySelector('#direct-editor .icon-close'); " +
"if (!button) return false; button.click(); return true; })()"
}

@SuppressLint("AddJavascriptInterface") // suppress warning as webview is only used > Lollipop
Expand Down Expand Up @@ -76,6 +81,18 @@ class TextEditorWebView : EditorWebView() {

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

private fun closeTextSessionOnBackPressed() {
onBackPressedDispatcher.addCallback(this) {
isEnabled = false
webView.evaluateJavascript(CLICK_TEXT_CLOSE_BUTTON_SCRIPT) { isClosing ->
if (isClosing != "true") {
finish()
}
}
}
}

Expand Down
Loading