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

move cursor closing in the function using it

Browse source
This commit is contained in:
tibbi 2017-05-28 23:17:06 +02:00
parent 18b714f9c3
commit a04d2d80b6
1 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,10 +58,8 @@ fun Context.getFilesFrom(curPath: String, isPickImage: Boolean, isPickVideo: Boo
val selectionArgs = if (curPath.isEmpty()) null else arrayOf("$curPath/%", "$curPath/%/%") val selectionArgs = if (curPath.isEmpty()) null else arrayOf("$curPath/%", "$curPath/%/%")
val cur = contentResolver.query(uri, projection, selection, selectionArgs, getSortingForFolder(curPath)) val cur = contentResolver.query(uri, projection, selection, selectionArgs, getSortingForFolder(curPath))
cur.use { cur ->
return parseCursor(this, cur, isPickImage, isPickVideo, curPath) return parseCursor(this, cur, isPickImage, isPickVideo, curPath)
} }
}
private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isPickVideo: Boolean, curPath: String): ArrayList<Medium> { private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isPickVideo: Boolean, curPath: String): ArrayList<Medium> {
val curMedia = ArrayList<Medium>() val curMedia = ArrayList<Medium>()
@ -69,6 +67,7 @@ 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
@ -142,6 +141,7 @@ private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isP
} }
} while (cur.moveToNext()) } while (cur.moveToNext())
} }
}
Medium.sorting = config.getFileSorting(curPath) Medium.sorting = config.getFileSorting(curPath)
curMedia.sort() curMedia.sort()