From 271514f2ce5f57fc01aa1e9987e18fbeb0dad684 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Thu, 13 Mar 2025 19:48:12 +0100 Subject: [PATCH] fix media picking not working (#4989) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit regression from https://github.com/tuskyapp/Tusky/pull/4978 I'm sure this `BottomSheetCallback` business had a reason, but it works fine without on all the devices I tried it with 🤷 --- .../components/compose/ComposeActivity.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index a27cae7ad..45ab7c84a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -996,24 +996,12 @@ class ComposeActivity : } private fun onMediaPick() { - addMediaBehavior.addBottomSheetCallback( - object : BottomSheetCallback() { - override fun onStateChanged(bottomSheet: View, newState: Int) { - // Wait until bottom sheet is not collapsed and show next screen after - if (newState == BottomSheetBehavior.STATE_COLLAPSED) { - addMediaBehavior.removeBottomSheetCallback(this) - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { - pickMediaFilePermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE) - } else { - pickMediaFileLauncher.launch(true) - } - } - } - - override fun onSlide(bottomSheet: View, slideOffset: Float) {} - } - ) - addMediaBehavior.state = BottomSheetBehavior.STATE_HIDDEN + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + pickMediaFilePermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE) + } else { + pickMediaFileLauncher.launch(true) + } + addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN) } private fun openPollDialog() = lifecycleScope.launch {