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

do not try closing the media fetching cursor twice

Browse source
This commit is contained in:
tibbi 2017-05-26 09:26:20 +02:00
parent 8e5f72f59b
commit e53d6a5c20
1 changed files with 64 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
View file

@ -69,80 +69,78 @@ private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isP
val showMedia = config.showMedia val showMedia = config.showMedia
val showHidden = config.shouldShowHidden val showHidden = config.shouldShowHidden
cur.use { cur -> if (cur.moveToFirst()) {
if (cur.moveToFirst()) { var filename: String
var filename: String var path: String
var path: String var dateTaken: Long
var dateTaken: Long var dateModified: Long
var dateModified: Long var size: Long
var size: Long var isImage: Boolean
var isImage: Boolean var isVideo: Boolean
var isVideo: Boolean val excludedFolders = config.excludedFolders
val excludedFolders = config.excludedFolders val noMediaFolders = context.getNoMediaFolders()
val noMediaFolders = context.getNoMediaFolders()
do { do {
try { try {
path = cur.getStringValue(MediaStore.Images.Media.DATA) path = cur.getStringValue(MediaStore.Images.Media.DATA)
size = cur.getLongValue(MediaStore.Images.Media.SIZE) size = cur.getLongValue(MediaStore.Images.Media.SIZE)
if (size == 0L) { if (size == 0L) {
size = File(path).length() size = File(path).length()
}
if (size <= 0L) {
continue
}
filename = cur.getStringValue(MediaStore.Images.Media.DISPLAY_NAME) ?: ""
if (filename.isEmpty())
filename = path.getFilenameFromPath()
isImage = filename.isImageFast() || filename.isGif()
isVideo = if (isImage) false else filename.isVideoFast()
if (!isImage && !isVideo)
continue
if (isVideo && (isPickImage || showMedia == IMAGES))
continue
if (isImage && (isPickVideo || showMedia == VIDEOS))
continue
if (!showHidden && filename.startsWith('.'))
continue
var isExcluded = false
excludedFolders.forEach {
if (path.startsWith(it)) {
isExcluded = true
} }
}
if (size <= 0L) { if (!isExcluded && !showHidden) {
continue noMediaFolders.forEach {
}
filename = cur.getStringValue(MediaStore.Images.Media.DISPLAY_NAME) ?: ""
if (filename.isEmpty())
filename = path.getFilenameFromPath()
isImage = filename.isImageFast() || filename.isGif()
isVideo = if (isImage) false else filename.isVideoFast()
if (!isImage && !isVideo)
continue
if (isVideo && (isPickImage || showMedia == IMAGES))
continue
if (isImage && (isPickVideo || showMedia == VIDEOS))
continue
if (!showHidden && filename.startsWith('.'))
continue
var isExcluded = false
excludedFolders.forEach {
if (path.startsWith(it)) { if (path.startsWith(it)) {
isExcluded = true isExcluded = true
} }
} }
if (!isExcluded && !showHidden) {
noMediaFolders.forEach {
if (path.startsWith(it)) {
isExcluded = true
}
}
}
if (!isExcluded && !showHidden && path.contains("/.")) {
isExcluded = true
}
if (!isExcluded) {
dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
curMedia.add(medium)
}
} catch (e: Exception) {
continue
} }
} while (cur.moveToNext())
} if (!isExcluded && !showHidden && path.contains("/.")) {
isExcluded = true
}
if (!isExcluded) {
dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
curMedia.add(medium)
}
} catch (e: Exception) {
continue
}
} while (cur.moveToNext())
} }
Medium.sorting = config.getFileSorting(curPath) Medium.sorting = config.getFileSorting(curPath)