kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-05 11:46:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3870 from kiwix/Fixes#3869

Browse Source 
Fixed: Long clicking on Download button in epub ZIM files shows the `Open in new tab` dialog which leads to a blank page.
This commit is contained in:
Kelson 2024-06-07 14:23:50 +02:00 committed by GitHub
commit 8e08acea4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.kt
View File

@ -77,7 +77,7 @@ open class CoreWebViewClient(
} }
@Suppress("NestedBlockDepth") @Suppress("NestedBlockDepth")
private fun handleUnsupportedFiles(url: String): Boolean { fun handleUnsupportedFiles(url: String): Boolean {
val extension = MimeTypeMap.getFileExtensionFromUrl(url) val extension = MimeTypeMap.getFileExtensionFromUrl(url)
if (DOCUMENT_TYPES.containsKey(extension)) { if (DOCUMENT_TYPES.containsKey(extension)) {
callback.showSaveOrOpenUnsupportedFilesDialog(url, DOCUMENT_TYPES[extension]) callback.showSaveOrOpenUnsupportedFilesDialog(url, DOCUMENT_TYPES[extension])

8
core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt
View File

@ -54,7 +54,7 @@ open class KiwixWebView @SuppressLint("SetJavaScriptEnabled") constructor(
attrs: AttributeSet, attrs: AttributeSet,
nonVideoView: ViewGroup, nonVideoView: ViewGroup,
videoView: ViewGroup, videoView: ViewGroup,
webViewClient: CoreWebViewClient, private val webViewClient: CoreWebViewClient,
val sharedPreferenceUtil: SharedPreferenceUtil val sharedPreferenceUtil: SharedPreferenceUtil
) : VideoEnabledWebView(context, attrs) { ) : VideoEnabledWebView(context, attrs) {
@ -108,7 +108,11 @@ open class KiwixWebView @SuppressLint("SetJavaScriptEnabled") constructor(
override fun performLongClick(): Boolean { override fun performLongClick(): Boolean {
val result = hitTestResult val result = hitTestResult
if (result.type == HitTestResult.SRC_ANCHOR_TYPE) { if (result.type == HitTestResult.SRC_ANCHOR_TYPE) {
result.extra?.let(callback::webViewLongClick) result.extra?.let {
if (!webViewClient.handleUnsupportedFiles(it)) {
callback.webViewLongClick(it)
}
}
return true return true
} }
return super.performLongClick() return super.performLongClick()