From e67d8ee7d1c4b15f435fabfe1469f7af5967d2b1 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 11 May 2013 17:41:20 -0700 Subject: Don't show null if artist is null --- .../github/daneren2005/dsub/fragments/DownloadFragment.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java index 8a1c1da5..e61670da 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -959,11 +959,16 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe case PREPARING: statusTextView.setText(R.string.download_playerstate_buffering); break; - case STARTED: - statusTextView.setText((currentPlaying != null) ? (currentPlaying.getSong().getArtist() + " - " + currentPlaying.getSong().getAlbum()) : null); - break; default: - statusTextView.setText((currentPlaying != null) ? (currentPlaying.getSong().getArtist() + " - " + currentPlaying.getSong().getAlbum()) : null); + if(currentPlaying != null) { + String artist = ""; + if(currentPlaying.getSong().getArtist() != null) { + artist = currentPlaying.getSong().getArtist() + " - "; + } + statusTextView.setText(artist + currentPlaying.getSong().getAlbum()); + } else { + statusTextView.setText(null); + } break; } -- cgit v1.2.3