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

Merge pull request #2464 from KryptKode/fix/android_12_mediastore_crash

Browse source 
fix media store crash on deletion on android 12
This commit is contained in:
Tibor Kaputa 2022-05-14 12:27:23 +02:00 committed by GitHub
commit 2e4d605940
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

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