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

check null items at getItemSelectionKey

Browse source
This commit is contained in:
tibbi 2018-10-14 13:20:31 +02:00
parent d0058b8429
commit cc68576106
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/PlaylistsAdapter.kt
View file

@ -61,7 +61,7 @@ class PlaylistsAdapter(activity: SimpleActivity, val playlists: ArrayList<Playli
override fun getItemKeyPosition(key: String) = playlists.indexOfFirst { it.id.toString() == key }
override fun getItemSelectionKey(position: Int) = playlists[position].id.toString()
override fun getItemSelectionKey(position: Int) = playlists.getOrNull(position)?.id?.toString()
private fun askConfirmDelete() {
RemovePlaylistDialog(activity) {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/SongAdapter.kt
View file

@ -116,7 +116,7 @@ class SongAdapter(activity: SimpleActivity, var songs: ArrayList<Song>, val list
override fun getItemKeyPosition(key: String) = songs.indexOfFirst { it.path == key }
override fun getItemSelectionKey(position: Int) = songs[position].path
override fun getItemSelectionKey(position: Int) = songs.getOrNull(position)?.path
fun searchOpened() {
transparentViewHeight = transparentView.height

6
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -638,16 +638,10 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
return Pair(resultBitmap, true)
}
}
} catch (e: Exception) {
}
}
if (song != null) {
try {
val songParentDirectory = File(song.path).parent.trimEnd('/')
val albumArtFiles = arrayListOf("folder.jpg", "albumart.jpg", "cover.jpg")
albumArtFiles.forEach {
val albumArtFilePath = "$songParentDirectory/$it"
if (getDoesFilePathExist(albumArtFilePath)) {
val bitmap = BitmapFactory.decodeFile(albumArtFilePath)