Fixed queryArtwork and removed unnecessary code in queryWithFilters

Author: Lucas Pinheiro

android/src/main/kotlin/com/lucasjosino/on_audio_query/query/OnArtworksQuery.kt

@@ -23,7 +23,7 @@ import kotlin.properties.Delegates
 class OnArtworksQuery : ViewModel() {
 
     //Main parameters
-    private var id: Int = 0
+    private var id: Long = 0
     private var size by Delegates.notNull<Int>()
     private lateinit var uri: Uri
     private lateinit var resolver: ContentResolver
@@ -34,7 +34,7 @@ class OnArtworksQuery : ViewModel() {
         resolver = context.contentResolver
 
         //Id, size, and uri
-        id = call.argument<Int>("id")!! ; size = call.argument<Int>("size")!!
+        id = call.argument<Long>("id")!! ; size = call.argument<Int>("size")!!
         format = checkArtworkFormat(call.argument<Int>("format")!!)
         uri = checkArtworkType(call.argument<Int>("type")!!)
 
@@ -53,7 +53,7 @@ class OnArtworksQuery : ViewModel() {
     private suspend fun loadArt() : ByteArray = withContext(Dispatchers.IO) {
         var artData = ByteArray(0)
         if (Build.VERSION.SDK_INT >= 29) {
-            val query = ContentUris.withAppendedId(uri, id.toLong())
+            val query = ContentUris.withAppendedId(uri, id)
             try {
                 val bitmap = resolver.loadThumbnail(query, Size(size, size), null)
                 artData = convertToByteArray(bitmap)!!

android/src/main/kotlin/com/lucasjosino/on_audio_query/query/OnWithFiltersQuery.kt

@@ -18,72 +18,14 @@ import kotlinx.coroutines.withContext
 class OnWithFiltersQuery : ViewModel() {
 
     //Main parameters
-    private val channelError = "on_audio_error"
+    private var projection: Array<String>? = arrayOf()
     private lateinit var resolver: ContentResolver
     @SuppressLint("StaticFieldLeak")
     private lateinit var context: Context
     private lateinit var resultWithFiltersList: ArrayList<MutableMap<String, Any>>
     private lateinit var withType: Uri
     private lateinit var args: String
-    private lateinit var argsKey:String
-
-    //Uri projection
-    private val withTypeProjection = arrayOf(
-            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-            MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI,
-            MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
-            MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI,
-            MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI
-    )
-
-    //Query songs projection
-    @SuppressLint("InlinedApi")
-    private val songProjection = arrayOf(
-            MediaStore.Audio.Media.DATA, //
-            MediaStore.Audio.Media.DISPLAY_NAME,
-            MediaStore.Audio.Media._ID,
-            MediaStore.Audio.Media.SIZE,
-            MediaStore.Audio.Media.ALBUM,
-            MediaStore.Audio.Media.ALBUM_ARTIST,
-            MediaStore.Audio.Media.ALBUM_ID,
-            MediaStore.Audio.Media.ARTIST,
-            MediaStore.Audio.Media.ARTIST_ID,
-            MediaStore.Audio.Media.BOOKMARK,
-            MediaStore.Audio.Media.COMPOSER,
-            MediaStore.Audio.Media.DATE_ADDED,
-            MediaStore.Audio.Media.DURATION,
-            MediaStore.Audio.Media.TITLE,
-            MediaStore.Audio.Media.TRACK,
-            MediaStore.Audio.Media.YEAR,
-            MediaStore.Audio.Media.IS_ALARM,
-            MediaStore.Audio.Media.IS_MUSIC, // 17
-            MediaStore.Audio.Media.IS_NOTIFICATION,
-            MediaStore.Audio.Media.IS_PODCAST,
-            MediaStore.Audio.Media.IS_RINGTONE
-    )
-
-    //Query playlists projection
-    private val playlistProjection = arrayOf(
-            MediaStore.Audio.Playlists.DATA,
-            MediaStore.Audio.Playlists._ID,
-            MediaStore.Audio.Playlists.DATE_ADDED,
-            MediaStore.Audio.Playlists.DATE_MODIFIED,
-            MediaStore.Audio.Playlists.NAME
-    )
-
-    //Query artists projection
-    private val artistProjection = arrayOf(
-            MediaStore.Audio.Artists._ID,
-            MediaStore.Audio.Artists.ARTIST,
-            MediaStore.Audio.Artists.NUMBER_OF_ALBUMS,
-            MediaStore.Audio.Artists.NUMBER_OF_TRACKS
-    )
-
-    //Query genres projection
-    private val genreProjection = arrayOf(
-            MediaStore.Audio.Genres._ID,
-            MediaStore.Audio.Genres.NAME
-    )
+    private lateinit var argsKey: String
 
     //
     fun queryWithFilters(context: Context, result: MethodChannel.Result, call: MethodCall) {
@@ -92,97 +34,30 @@ class OnWithFiltersQuery : ViewModel() {
         //Setup Type and Args
         withType = checkWithFiltersType(call.argument<Int>("withType")!!)
         args = call.argument<String>("argsVal")!! + "%"
+        projection = checkProjection(withType)
+
+        //Setup Args
+        argsKey = when (withType) {
+            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI -> checkSongsArgs(call.argument<Int>("args")!!)
+            MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI -> checkAlbumsArgs(call.argument<Int>("args")!!)
+            MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI -> checkPlaylistsArgs(call.argument<Int>("args")!!)
+            MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI -> checkArtistsArgs(call.argument<Int>("args")!!)
+            MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI -> checkGenresArgs(call.argument<Int>("args")!!)
+            else -> throw Exception("[argsKey] returned null. Report this issue on [on_audio_query] GitHub.")
+        }
 
-        //
-        when (withType) {
-            //
-            withTypeProjection[0] ->
-                viewModelScope.launch { argsKey = checkSongsArgs(call.argument<Int>("args")!!)
-                    resultWithFiltersList = loadSongsWithFilters() ; result.success(resultWithFiltersList) }
-
-            //
-            withTypeProjection[1] ->
-                viewModelScope.launch { argsKey = checkAlbumsArgs(call.argument<Int>("args")!!)
-                    resultWithFiltersList = loadAlbumsWithFilters() ; result.success(resultWithFiltersList) }
-
-            //
-            withTypeProjection[2] ->
-                viewModelScope.launch { argsKey = checkPlaylistsArgs(call.argument<Int>("args")!!)
-                    resultWithFiltersList = loadPlaylistsWithFilters() ; result.success(resultWithFiltersList) }
+        //Query everything in the Background it's necessary for better performance
+        viewModelScope.launch {
+            //Start querying
+            resultWithFiltersList = loadSongsWithFilters()
 
             //
-            withTypeProjection[3] ->
-                viewModelScope.launch { argsKey = checkArtistsArgs(call.argument<Int>("args")!!)
-                    resultWithFiltersList = loadArtistsWithFilters() ; result.success(resultWithFiltersList) }
-
-            //
-            withTypeProjection[4] ->
-                viewModelScope.launch { argsKey = checkGenresArgs(call.argument<Int>("args")!!)
-                    resultWithFiltersList = loadGenresWithFilters() ; result.success(resultWithFiltersList) }
-
-            //
-            else -> result.error(channelError, "Filter type in [queryWithFilters] not found", null)
-        }
+            result.success(resultWithFiltersList) }
     }
 
     //Loading in Background
     private suspend fun loadSongsWithFilters() : ArrayList<MutableMap<String, Any>> = withContext(Dispatchers.IO) {
-        val cursor = resolver.query(withType, songProjection, argsKey, arrayOf(args), null)
-        val withFiltersList: ArrayList<MutableMap<String, Any>> = ArrayList()
-        while (cursor != null && cursor.moveToNext()) {
-            val withFiltersData: MutableMap<String, Any> = HashMap()
-            for (audioMedia in cursor.columnNames) {
-                if (cursor.getString(cursor.getColumnIndex(audioMedia)) != null) {
-                    withFiltersData[audioMedia] = cursor.getString(cursor.getColumnIndex(audioMedia))
-                } else withFiltersData[audioMedia] = ""
-            }
-
-            //Artwork
-            val art = loadArtwork(context, withFiltersData["album"].toString())
-            if (art.isNotEmpty()) withFiltersData["artwork"] = art
-            withFiltersList.add(withFiltersData)
-        }
-        cursor?.close()
-        return@withContext withFiltersList
-    }
-
-    //Loading in Background
-    private suspend fun loadAlbumsWithFilters() : ArrayList<MutableMap<String, Any>> = withContext(Dispatchers.IO) {
-        val cursor = resolver.query(withType, null, argsKey, arrayOf(args), null)
-        val withFiltersList: ArrayList<MutableMap<String, Any>> = ArrayList()
-        while (cursor != null && cursor.moveToNext()) {
-            val withFiltersData: MutableMap<String, Any> = HashMap()
-            for (audioMedia in cursor.columnNames) {
-                if (cursor.getString(cursor.getColumnIndex(audioMedia)) != null) {
-                    withFiltersData[audioMedia] = cursor.getString(cursor.getColumnIndex(audioMedia))
-                } else withFiltersData[audioMedia] = ""
-            }
-            withFiltersList.add(withFiltersData)
-        }
-        cursor?.close()
-        return@withContext withFiltersList
-    }
-
-    //Loading in Background
-    private suspend fun loadArtistsWithFilters() : ArrayList<MutableMap<String, Any>> = withContext(Dispatchers.IO) {
-        val cursor = resolver.query(withType, artistProjection, argsKey, arrayOf(args), null)
-        val withFiltersList: ArrayList<MutableMap<String, Any>> = ArrayList()
-        while (cursor != null && cursor.moveToNext()) {
-            val withFiltersData: MutableMap<String, Any> = HashMap()
-            for (audioMedia in cursor.columnNames) {
-                if (cursor.getString(cursor.getColumnIndex(audioMedia)) != null) {
-                    withFiltersData[audioMedia] = cursor.getString(cursor.getColumnIndex(audioMedia))
-                } else withFiltersData[audioMedia] = ""
-            }
-            withFiltersList.add(withFiltersData)
-        }
-        cursor?.close()
-        return@withContext withFiltersList
-    }
-
-    //Loading in Background
-    private suspend fun loadPlaylistsWithFilters() : ArrayList<MutableMap<String, Any>> = withContext(Dispatchers.IO) {
-        val cursor = resolver.query(withType, playlistProjection, argsKey, arrayOf(args), null)
+        val cursor = resolver.query(withType, projection, argsKey, arrayOf(args), null)
         val withFiltersList: ArrayList<MutableMap<String, Any>> = ArrayList()
         while (cursor != null && cursor.moveToNext()) {
             val withFiltersData: MutableMap<String, Any> = HashMap()
@@ -191,24 +66,13 @@ class OnWithFiltersQuery : ViewModel() {
                     withFiltersData[audioMedia] = cursor.getString(cursor.getColumnIndex(audioMedia))
                 } else withFiltersData[audioMedia] = ""
             }
-            withFiltersList.add(withFiltersData)
-        }
-        cursor?.close()
-        return@withContext withFiltersList
-    }
 
-    //Loading in Background
-    private suspend fun loadGenresWithFilters() : ArrayList<MutableMap<String, Any>> = withContext(Dispatchers.IO) {
-        val cursor = resolver.query(withType, genreProjection, argsKey, arrayOf(args), null)
-        val withFiltersList: ArrayList<MutableMap<String, Any>> = ArrayList()
-        while (cursor != null && cursor.moveToNext()) {
-            val withFiltersData: MutableMap<String, Any> = HashMap()
-            for (audioMedia in cursor.columnNames) {
-                if (cursor.getString(cursor.getColumnIndex(audioMedia)) != null) {
-                    withFiltersData[audioMedia] = cursor.getString(cursor.getColumnIndex(audioMedia))
-                } else withFiltersData[audioMedia] = ""
-            }
-            withFiltersList.add(withFiltersData)
+            if (withType == MediaStore.Audio.Media.EXTERNAL_CONTENT_URI) {
+                //Artwork
+                val art = loadArtwork(context, withFiltersData["album"].toString())
+                if (art.isNotEmpty()) withFiltersData["artwork"] = art
+                withFiltersList.add(withFiltersData)
+            } else withFiltersList.add(withFiltersData)
         }
         cursor?.close()
         return@withContext withFiltersList

android/src/main/kotlin/com/lucasjosino/on_audio_query/types/WithFiltersType.kt

@@ -15,6 +15,17 @@ fun checkWithFiltersType(sortType: Int): Uri {
     }
 }
 
+fun checkProjection(withType: Uri) : Array<String>? {
+    return when (withType) {
+        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI -> songProjection
+        MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI -> null
+        MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI -> playlistProjection
+        MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI -> artistProjection
+        MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI -> genreProjection
+        else -> songProjection
+    }
+}
+
 @SuppressLint("InlinedApi")
 fun checkSongsArgs(args: Int): String {
     return when (args) {
@@ -54,3 +65,52 @@ fun checkGenresArgs(args: Int): String {
         else -> MediaStore.Audio.Genres.NAME + " like ?"
     }
 }
+
+//Query songs projection
+@SuppressLint("InlinedApi")
+private val songProjection = arrayOf(
+        MediaStore.Audio.Media.DATA, //
+        MediaStore.Audio.Media.DISPLAY_NAME,
+        MediaStore.Audio.Media._ID,
+        MediaStore.Audio.Media.SIZE,
+        MediaStore.Audio.Media.ALBUM,
+        MediaStore.Audio.Media.ALBUM_ARTIST,
+        MediaStore.Audio.Media.ALBUM_ID,
+        MediaStore.Audio.Media.ARTIST,
+        MediaStore.Audio.Media.ARTIST_ID,
+        MediaStore.Audio.Media.BOOKMARK,
+        MediaStore.Audio.Media.COMPOSER,
+        MediaStore.Audio.Media.DATE_ADDED,
+        MediaStore.Audio.Media.DURATION,
+        MediaStore.Audio.Media.TITLE,
+        MediaStore.Audio.Media.TRACK,
+        MediaStore.Audio.Media.YEAR,
+        MediaStore.Audio.Media.IS_ALARM,
+        MediaStore.Audio.Media.IS_MUSIC, // 17
+        MediaStore.Audio.Media.IS_NOTIFICATION,
+        MediaStore.Audio.Media.IS_PODCAST,
+        MediaStore.Audio.Media.IS_RINGTONE
+)
+
+//Query playlists projection
+private val playlistProjection = arrayOf(
+        MediaStore.Audio.Playlists.DATA,
+        MediaStore.Audio.Playlists._ID,
+        MediaStore.Audio.Playlists.DATE_ADDED,
+        MediaStore.Audio.Playlists.DATE_MODIFIED,
+        MediaStore.Audio.Playlists.NAME
+)
+
+//Query artists projection
+private val artistProjection = arrayOf(
+        MediaStore.Audio.Artists._ID,
+        MediaStore.Audio.Artists.ARTIST,
+        MediaStore.Audio.Artists.NUMBER_OF_ALBUMS,
+        MediaStore.Audio.Artists.NUMBER_OF_TRACKS
+)
+
+//Query genres projection
+private val genreProjection = arrayOf(
+        MediaStore.Audio.Genres._ID,
+        MediaStore.Audio.Genres.NAME
+)