wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

properly handle album fetching on Android below Q

Browse source
This commit is contained in:
tibbi 2020-09-30 21:43:12 +02:00
parent ca1a1a2b00
commit b61fe8718d
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/kotlin/com/simplemobiletools/musicplayer/fragments/ArtistsFragment.kt
View file

@ -8,6 +8,7 @@ import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue
import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isQPlus
import com.simplemobiletools.musicplayer.activities.SimpleActivity
import com.simplemobiletools.musicplayer.adapters.ArtistsAdapter
import com.simplemobiletools.musicplayer.models.Album
@ -26,7 +27,7 @@ class ArtistsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
private fun openArtist(activity: Activity, artist: Artist) {
getAlbums(activity, artist.id) {
getAlbums(activity, artist) {
}
}
@ -66,27 +67,32 @@ class ArtistsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
}
}
private fun getAlbums(activity: Activity, artistId: Int, callback: (artists: ArrayList<Album>) -> Unit) {
private fun getAlbums(activity: Activity, artist: Artist, callback: (artists: ArrayList<Album>) -> Unit) {
ensureBackgroundThread {
val albums = ArrayList<Album>()
val uri = Audio.Albums.EXTERNAL_CONTENT_URI
val projection = arrayOf(
Audio.Albums.ALBUM_ID,
Audio.Albums._ID,
Audio.Albums.ARTIST,
Audio.Albums.ALBUM)
val selection = "${Audio.Albums.ARTIST_ID} = ?"
val selectionArgs = arrayOf(artistId.toString())
var selection = "${Audio.Albums.ARTIST} = ?"
var selectionArgs = arrayOf(artist.title)
if (isQPlus()) {
selection = "${Audio.Albums.ARTIST_ID} = ?"
selectionArgs = arrayOf(artist.id.toString())
}
try {
val cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)
cursor?.use {
if (cursor.moveToFirst()) {
do {
val id = cursor.getIntValue(Audio.Albums.ALBUM_ID)
val artist = cursor.getStringValue(Audio.Albums.ARTIST)
val id = cursor.getIntValue(Audio.Albums._ID)
val artistName = cursor.getStringValue(Audio.Albums.ARTIST)
val title = cursor.getStringValue(Audio.Albums.ALBUM)
val album = Album(id, artist, title)
val album = Album(id, artistName, title)
albums.add(album)
} while (cursor.moveToNext())
}