make sure we clean up invalid recycle bin db entries

2018-06-27 15:20:45 +02:00 · 2018-06-27 15:20:45 +02:00 · ed8fa63ce8
parent 59cb293d98
commit ed8fa63ce8
1 changed files with 6 additions and 1 deletions
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
@ -364,8 +364,13 @@ fun Context.getCachedMedia(path: String, getVideosOnly: Boolean = false, getImag
        val grouped = mediaFetcher.groupMedia(media, path)
        callback(grouped.clone() as ArrayList<ThumbnailItem>)

+        val recycleBinPath = filesDir.toString()
        media.filter { !getDoesFilePathExist(it.path) }.forEach {
-            mediumDao.deleteMediumPath(it.path)
+            if (it.path.startsWith(recycleBinPath)) {
+                mediumDao.deleteMediumPath(it.path.removePrefix(recycleBinPath))
+            } else {
+                mediumDao.deleteMediumPath(it.path)
+            }
        }
    }.start()
 }