[Android] Fix the crash when scrolling the mini player in the album screen

Nicolas Pomepuy git at videolan.org
Fri Jan 31 09:38:27 UTC 2025


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jan 30 12:16:45 2025 +0100| [8b95acf5e09eadf9e5297758133d64202bec3790] | committer: Nicolas Pomepuy

Fix the crash when scrolling the mini player in the album screen

Fixes #3137

> https://code.videolan.org/videolan/vlc-android/commit/8b95acf5e09eadf9e5297758133d64202bec3790
---

 .../vlc/gui/AudioPlayerContainerActivity.kt        | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt b/application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
index b1b5c2f7ab..152a63ce61 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
@@ -255,17 +255,19 @@ open class AudioPlayerContainerActivity : BaseActivity(), KeycodeListener, Sched
     }
 
     private fun updateToolbarScrollability(enabled: Boolean) {
-        val params = toolbar.layoutParams as AppBarLayout.LayoutParams
-        val appBarLayoutParams = appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
-
-        if (!enabled) {
-            params.scrollFlags = 0
-            appBarLayoutParams.behavior = null
-            appBarLayout.setLayoutParams(appBarLayoutParams)
-        } else {
-            params.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP
-            appBarLayoutParams.behavior = AppBarLayout.Behavior()
-            appBarLayout.setLayoutParams(appBarLayoutParams)
+        if (toolbar.layoutParams is AppBarLayout.LayoutParams) {
+            val params = toolbar.layoutParams as AppBarLayout.LayoutParams
+            val appBarLayoutParams = appBarLayout.layoutParams as CoordinatorLayout.LayoutParams
+
+            if (!enabled) {
+                params.scrollFlags = 0
+                appBarLayoutParams.behavior = null
+                appBarLayout.setLayoutParams(appBarLayoutParams)
+            } else {
+                params.scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP
+                appBarLayoutParams.behavior = AppBarLayout.Behavior()
+                appBarLayout.setLayoutParams(appBarLayoutParams)
+            }
         }
     }
 



More information about the Android mailing list