aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-05-11 17:41:20 -0700
committerScott Jackson <daneren2005@gmail.com>2013-05-11 17:41:20 -0700
commite67d8ee7d1c4b15f435fabfe1469f7af5967d2b1 (patch)
treebfdd3beee4bb9b336a4c1b5ed8339376611655ea
parenta6819a7da17d2912776bca43039d5726c15b8343 (diff)
downloaddsub-e67d8ee7d1c4b15f435fabfe1469f7af5967d2b1.tar.gz
dsub-e67d8ee7d1c4b15f435fabfe1469f7af5967d2b1.tar.bz2
dsub-e67d8ee7d1c4b15f435fabfe1469f7af5967d2b1.zip
Don't show null if artist is null
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/fragments/DownloadFragment.java13
1 files 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;
}