From e53d6a5c2052bec96562f2cd115ffed16a58d130 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 26 May 2017 09:26:20 +0200
Subject: [PATCH] do not try closing the media fetching cursor twice

---
 .../gallery/extensions/context.kt             | 130 +++++++++---------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
index d128cd69b..5b92327d0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/context.kt
@@ -69,80 +69,78 @@ private fun parseCursor(context: Context, cur: Cursor, isPickImage: Boolean, isP
     val showMedia = config.showMedia
     val showHidden = config.shouldShowHidden
 
-    cur.use { cur ->
-        if (cur.moveToFirst()) {
-            var filename: String
-            var path: String
-            var dateTaken: Long
-            var dateModified: Long
-            var size: Long
-            var isImage: Boolean
-            var isVideo: Boolean
-            val excludedFolders = config.excludedFolders
-            val noMediaFolders = context.getNoMediaFolders()
+    if (cur.moveToFirst()) {
+        var filename: String
+        var path: String
+        var dateTaken: Long
+        var dateModified: Long
+        var size: Long
+        var isImage: Boolean
+        var isVideo: Boolean
+        val excludedFolders = config.excludedFolders
+        val noMediaFolders = context.getNoMediaFolders()
 
-            do {
-                try {
-                    path = cur.getStringValue(MediaStore.Images.Media.DATA)
-                    size = cur.getLongValue(MediaStore.Images.Media.SIZE)
-                    if (size == 0L) {
-                        size = File(path).length()
+        do {
+            try {
+                path = cur.getStringValue(MediaStore.Images.Media.DATA)
+                size = cur.getLongValue(MediaStore.Images.Media.SIZE)
+                if (size == 0L) {
+                    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) {
-                        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 (!isExcluded && !showHidden) {
+                    noMediaFolders.forEach {
                         if (path.startsWith(it)) {
                             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)