Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-29 16:08:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix media store crash on deletion on android 12

Browse source 
- MediaStore crashed on deletion because the ViewPagerActivity got finish before the MediaStore.createDeleteRequest executes
- To fix, we apply the same approach in the MediaActivity and finish explicitly after deletion completes, if the media list is empty
- also, only refresh the UI when the media list is not empty to avoid UI glitches
- fix slideshow bug by resetting mAreSlideShowMediaVisible back to false when the slideshow ends
This commit is contained in:
darthpaul 2022-05-14 03:51:52 +01:00
parent b3ad40739f
commit 3571fcd3ab
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -591,6 +591,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
showSystemUI(true)
mSlideshowHandler.removeCallbacksAndMessages(null)
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
mAreSlideShowMediaVisible = false
}
}
@ -1128,16 +1129,21 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
}
mIgnoredPaths.add(fileDirItem.path)
val media = mMediaFiles.filter { !mIgnoredPaths.contains(it.path) } as ArrayList<ThumbnailItem>
runOnUiThread {
gotMedia(media, true, false)
val media = mMediaFiles.filter { !mIgnoredPaths.contains(it.path) } as ArrayList<Medium>
if (media.isNotEmpty()) {
runOnUiThread {
refreshUI(media, true)
}
}
movePathsInRecycleBin(arrayListOf(path)) {
if (it) {
tryDeleteFileDirItem(fileDirItem, false, false) {
mIgnoredPaths.remove(fileDirItem.path)
deleteDirectoryIfEmpty()
if (media.isEmpty()) {
deleteDirectoryIfEmpty()
finish()
}
}
} else {
toast(R.string.unknown_error_occurred)
@ -1156,14 +1162,19 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
}
mIgnoredPaths.add(fileDirItem.path)
val media = mMediaFiles.filter { !mIgnoredPaths.contains(it.path) } as ArrayList<ThumbnailItem>
runOnUiThread {
gotMedia(media, true, false)
val media = mMediaFiles.filter { !mIgnoredPaths.contains(it.path) } as ArrayList<Medium>
if (media.isNotEmpty()) {
runOnUiThread {
refreshUI(media, true)
}
}
tryDeleteFileDirItem(fileDirItem, false, true) {
mIgnoredPaths.remove(fileDirItem.path)
deleteDirectoryIfEmpty()
if (media.isEmpty()) {
deleteDirectoryIfEmpty()
finish()
}
}
}
}
@ -1227,6 +1238,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
return
}
refreshUI(media, refetchViewPagerPosition)
}
private fun refreshUI(media: ArrayList<Medium>, refetchViewPagerPosition: Boolean) {
mPrevHashcode = media.hashCode()
mMediaFiles = media