fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

add a medium null check at scrollStateChanged trigger

Browse Source
This commit is contained in:
tibbi
2017-10-24 21:53:28 +02:00
parent aca83d7fad
commit 498cd10ba6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View File

@ -730,10 +730,11 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
} }
private fun getCurrentMedium(): Medium? { private fun getCurrentMedium(): Medium? {
return if (getCurrentMedia().isEmpty() || mPos == -1) return if (getCurrentMedia().isEmpty() || mPos == -1) {
null null
else } else {
getCurrentMedia()[Math.min(mPos, getCurrentMedia().size - 1)] getCurrentMedia()[Math.min(mPos, getCurrentMedia().size - 1)]
}
} }
private fun getCurrentMedia() = if (mAreSlideShowMediaVisible) mSlideshowMedia else mMedia private fun getCurrentMedia() = if (mAreSlideShowMediaVisible) mSlideshowMedia else mMedia
@ -756,7 +757,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
} }
override fun onPageScrollStateChanged(state: Int) { override fun onPageScrollStateChanged(state: Int) {
if (state == ViewPager.SCROLL_STATE_IDLE) { if (state == ViewPager.SCROLL_STATE_IDLE && getCurrentMedium() != null) {
checkOrientation() checkOrientation()
} }
} }