From 5820b2f5114adfb394a7848d25bdbc7b584fa579 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 12 Feb 2022 20:31:30 +0200 Subject: [PATCH] Fix saved page sharing --- .../java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt | 6 +++--- app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index c745d2071..4ed70ba02 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt @@ -238,8 +238,8 @@ class ReaderActivity : BaseFullscreenActivity(), ) { false } else { - val targets = binding.root.hitTest(rawX, rawY) - targets.none { it.hasOnClickListeners() } + val touchables = window.peekDecorView()?.touchables + touchables?.none { it.hasGlobalPoint(rawX, rawY) } ?: true } } @@ -281,7 +281,7 @@ class ReaderActivity : BaseFullscreenActivity(), private fun onPageSaved(uri: Uri?) { if (uri != null) { - Snackbar.make(binding.container, R.string.page_saved, Snackbar.LENGTH_LONG) + Snackbar.make(binding.container, R.string.page_saved, Snackbar.LENGTH_INDEFINITE) .setAnchorView(binding.appbarBottom) .setAction(R.string.share) { ShareHelper(this).shareImage(uri) diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt index fdfb8f20d..b06b18d16 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ShareHelper.kt @@ -46,7 +46,7 @@ class ShareHelper(private val context: Context) { fun shareImage(uri: Uri) { val intent = Intent(Intent.ACTION_SEND) - intent.setDataAndType(uri, context.contentResolver.getType(uri)) + intent.setDataAndType(uri, context.contentResolver.getType(uri) ?: "image/*") intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) val shareIntent = Intent.createChooser(intent, context.getString(R.string.share_image)) context.startActivity(shareIntent)