Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Import Playlist crash on ColorOS devices

Browse source
This commit is contained in:
Prathamesh More 2021-12-29 14:55:13 +05:30
parent 70474a1462
commit f4f4db4d47
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
View file

@ -49,6 +49,4 @@ open class Playlist(
result = 31 * result + name.hashCode() result = 31 * result + name.hashCode()
return result return result
} }
} }

12
app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
View file

@ -17,7 +17,6 @@ package code.name.monkey.retromusic.repository
import android.content.ContentResolver import android.content.ContentResolver
import android.database.Cursor import android.database.Cursor
import android.provider.BaseColumns import android.provider.BaseColumns
import android.provider.MediaStore
import android.provider.MediaStore.Audio.AudioColumns import android.provider.MediaStore.Audio.AudioColumns
import android.provider.MediaStore.Audio.Playlists.* import android.provider.MediaStore.Audio.Playlists.*
import android.provider.MediaStore.Audio.PlaylistsColumns import android.provider.MediaStore.Audio.PlaylistsColumns
@ -120,13 +119,18 @@ class RealPlaylistRepository(
private fun getPlaylistFromCursorImpl( private fun getPlaylistFromCursorImpl(
cursor: Cursor cursor: Cursor
): Playlist { ): Playlist {
val id = cursor.getLong(MediaStore.MediaColumns._ID) val id = cursor.getLong(0)
val name = cursor.getString(NAME) val name = cursor.getString(1)
return Playlist(id, name) return if (name != null) {
Playlist(id, name)
} else {
Playlist.empty
}
} }
override fun playlistSongs(playlistId: Long): List<Song> { override fun playlistSongs(playlistId: Long): List<Song> {
val songs = arrayListOf<Song>() val songs = arrayListOf<Song>()
if (playlistId == -1L) return songs
val cursor = makePlaylistSongCursor(playlistId) val cursor = makePlaylistSongCursor(playlistId)
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {