Fixed Import Playlist crash on ColorOS devices
This commit is contained in:
parent
70474a1462
commit
f4f4db4d47
2 changed files with 8 additions and 6 deletions
|
@ -49,6 +49,4 @@ open class Playlist(
|
|||
result = 31 * result + name.hashCode()
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -17,7 +17,6 @@ package code.name.monkey.retromusic.repository
|
|||
import android.content.ContentResolver
|
||||
import android.database.Cursor
|
||||
import android.provider.BaseColumns
|
||||
import android.provider.MediaStore
|
||||
import android.provider.MediaStore.Audio.AudioColumns
|
||||
import android.provider.MediaStore.Audio.Playlists.*
|
||||
import android.provider.MediaStore.Audio.PlaylistsColumns
|
||||
|
@ -120,13 +119,18 @@ class RealPlaylistRepository(
|
|||
private fun getPlaylistFromCursorImpl(
|
||||
cursor: Cursor
|
||||
): Playlist {
|
||||
val id = cursor.getLong(MediaStore.MediaColumns._ID)
|
||||
val name = cursor.getString(NAME)
|
||||
return Playlist(id, name)
|
||||
val id = cursor.getLong(0)
|
||||
val name = cursor.getString(1)
|
||||
return if (name != null) {
|
||||
Playlist(id, name)
|
||||
} else {
|
||||
Playlist.empty
|
||||
}
|
||||
}
|
||||
|
||||
override fun playlistSongs(playlistId: Long): List<Song> {
|
||||
val songs = arrayListOf<Song>()
|
||||
if (playlistId == -1L) return songs
|
||||
val cursor = makePlaylistSongCursor(playlistId)
|
||||
|
||||
if (cursor != null && cursor.moveToFirst()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue