Merge "PreviewDataProvider to close content resolver's cursors" into main

1 files changed, 35 insertions, 33 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
index 9f1cc6c1..bb303c7b 100644
--- a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
+++ b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
@@ -264,44 +264,46 @@ constructor(
 
         private val query by lazy { readQueryResult() }
 
-        private fun readQueryResult(): QueryResult {
-            val cursor =
-                contentResolver.querySafe(uri)?.takeIf { it.moveToFirst() } ?: return QueryResult()
-
-            var flagColIdx = -1
-            var displayIconUriColIdx = -1
-            var nameColIndex = -1
-            var titleColIndex = -1
-            // TODO: double-check why Cursor#getColumnInded didn't work
-            cursor.columnNames.forEachIndexed { i, columnName ->
-                when (columnName) {
-                    DocumentsContract.Document.COLUMN_FLAGS -> flagColIdx = i
-                    MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI -> displayIconUriColIdx = i
-                    OpenableColumns.DISPLAY_NAME -> nameColIndex = i
-                    Downloads.Impl.COLUMN_TITLE -> titleColIndex = i
+        private fun readQueryResult(): QueryResult =
+            contentResolver.querySafe(uri)?.use { cursor ->
+                if (!cursor.moveToFirst()) return@use null
+
+                var flagColIdx = -1
+                var displayIconUriColIdx = -1
+                var nameColIndex = -1
+                var titleColIndex = -1
+                // TODO: double-check why Cursor#getColumnInded didn't work
+                cursor.columnNames.forEachIndexed { i, columnName ->
+                    when (columnName) {
+                        DocumentsContract.Document.COLUMN_FLAGS -> flagColIdx = i
+                        MediaMetadata.METADATA_KEY_DISPLAY_ICON_URI -> displayIconUriColIdx = i
+                        OpenableColumns.DISPLAY_NAME -> nameColIndex = i
+                        Downloads.Impl.COLUMN_TITLE -> titleColIndex = i
+                    }
                 }
-            }
-
-            val supportsThumbnail =
-                flagColIdx >= 0 && ((cursor.getInt(flagColIdx) and FLAG_SUPPORTS_THUMBNAIL) != 0)
 
-            var title = ""
-            if (nameColIndex >= 0) {
-                title = cursor.getString(nameColIndex) ?: ""
-            }
-            if (TextUtils.isEmpty(title) && titleColIndex >= 0) {
-                title = cursor.getString(titleColIndex) ?: ""
-            }
+                val supportsThumbnail =
+                    flagColIdx >= 0 &&
+                        ((cursor.getInt(flagColIdx) and FLAG_SUPPORTS_THUMBNAIL) != 0)
 
-            val iconUri =
-                if (displayIconUriColIdx >= 0) {
-                    cursor.getString(displayIconUriColIdx)?.let(Uri::parse)
-                } else {
-                    null
+                var title = ""
+                if (nameColIndex >= 0) {
+                    title = cursor.getString(nameColIndex) ?: ""
+                }
+                if (TextUtils.isEmpty(title) && titleColIndex >= 0) {
+                    title = cursor.getString(titleColIndex) ?: ""
                 }
 
-            return QueryResult(supportsThumbnail, title, iconUri)
-        }
+                val iconUri =
+                    if (displayIconUriColIdx >= 0) {
+                        cursor.getString(displayIconUriColIdx)?.let(Uri::parse)
+                    } else {
+                        null
+                    }
+
+                QueryResult(supportsThumbnail, title, iconUri)
+            }
+                ?: QueryResult()
     }
 
     private class QueryResult(