PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

use the new way of querying contentresolver on api 30+

Browse source
This commit is contained in:
tibbi 2021-04-17 23:29:40 +02:00
parent 5202b77e8c
commit 851fddc67a
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MediaFetcher.kt
View file

@ -1,8 +1,11 @@
package com.simplemobiletools.gallery.pro.helpers package com.simplemobiletools.gallery.pro.helpers
import android.annotation.SuppressLint
import android.content.ContentResolver
import android.content.Context import android.content.Context
import android.database.Cursor import android.database.Cursor
import android.net.Uri import android.net.Uri
import android.os.Bundle
import android.os.Environment import android.os.Environment
import android.provider.BaseColumns import android.provider.BaseColumns
import android.provider.MediaStore.Files import android.provider.MediaStore.Files
@ -97,20 +100,38 @@ class MediaFetcher(val context: Context) {
} }
} }
@SuppressLint("NewApi")
private fun getLatestFileFolders(): LinkedHashSet<String> { private fun getLatestFileFolders(): LinkedHashSet<String> {
val uri = Files.getContentUri("external") val uri = Files.getContentUri("external")
val projection = arrayOf(Images.ImageColumns.DATA) val projection = arrayOf(Images.ImageColumns.DATA)
val parents = LinkedHashSet<String>() val parents = LinkedHashSet<String>()
val sorting = "${BaseColumns._ID} DESC LIMIT 50"
var cursor: Cursor? = null var cursor: Cursor? = null
try { try {
cursor = context.contentResolver.query(uri, projection, null, null, sorting) if (isRPlus()) {
val bundle = Bundle().apply {
putInt(ContentResolver.QUERY_ARG_LIMIT, 10)
putStringArray(ContentResolver.QUERY_ARG_SORT_COLUMNS, arrayOf(BaseColumns._ID))
putInt(ContentResolver.QUERY_ARG_SORT_DIRECTION, ContentResolver.QUERY_SORT_DIRECTION_DESCENDING)
}
cursor = context.contentResolver.query(uri, projection, bundle, null)
if (cursor?.moveToFirst() == true) { if (cursor?.moveToFirst() == true) {
do { do {
val path = cursor.getStringValue(Images.ImageColumns.DATA) ?: continue val path = cursor.getStringValue(Images.ImageColumns.DATA) ?: continue
parents.add(path.getParentPath()) parents.add(path.getParentPath())
} while (cursor.moveToNext()) } while (cursor.moveToNext())
} }
} else {
val sorting = "${BaseColumns._ID} DESC LIMIT 10"
cursor = context.contentResolver.query(uri, projection, null, null, sorting)
if (cursor?.moveToFirst() == true) {
do {
val path = cursor.getStringValue(Images.ImageColumns.DATA) ?: continue
mydebug("path $path")
parents.add(path.getParentPath())
} while (cursor.moveToNext())
}
}
} catch (e: Exception) { } catch (e: Exception) {
context.showErrorToast(e) context.showErrorToast(e)
} finally { } finally {