From 5d1a75bc1384ee32d296b0d076753733d503f6b2 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 21 Sep 2020 00:39:26 -0400 Subject: [PATCH] Fixing bug when preference is not set --- .../main/java/code/name/monkey/retromusic/model/Artist.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt b/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt index fbfde54c..bb4fd0b1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt +++ b/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt @@ -15,6 +15,7 @@ package code.name.monkey.retromusic.model import code.name.monkey.retromusic.util.MusicUtil +import code.name.monkey.retromusic.util.PreferenceUtil import java.util.* data class Artist( @@ -25,10 +26,11 @@ data class Artist( val name: String get() { val name = safeGetFirstAlbum().safeGetFirstSong().albumArtist + if (PreferenceUtil.albumArtistsOnly && MusicUtil.isVariousArtists(name)) { + return VARIOUS_ARTISTS_DISPLAY_NAME + } return if (MusicUtil.isArtistNameUnknown(name)) { UNKNOWN_ARTIST_DISPLAY_NAME - } else if (MusicUtil.isVariousArtists(name)) { - VARIOUS_ARTISTS_DISPLAY_NAME } else safeGetFirstAlbum().safeGetFirstSong().artistName }