diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-09-09 09:05:47 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-09-09 09:05:47 -0700 |
commit | 2f0c0b210cb12e7d7b7cb50c10e7c9e78f23d66f (patch) | |
tree | 7e9c84b1fdb84e58380f86b09baccdfecd4eff8f /app/src/main/java/github | |
parent | df81ad285a5d7c020aa17ee20aa04ed223affd92 (diff) | |
download | dsub-2f0c0b210cb12e7d7b7cb50c10e7c9e78f23d66f.tar.gz dsub-2f0c0b210cb12e7d7b7cb50c10e7c9e78f23d66f.tar.bz2 dsub-2f0c0b210cb12e7d7b7cb50c10e7c9e78f23d66f.zip |
Add album for song search results
Diffstat (limited to 'app/src/main/java/github')
-rw-r--r-- | app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java b/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java index 63bbaaa4..f91c364e 100644 --- a/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java +++ b/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java @@ -156,7 +156,21 @@ public class DSubSearchProvider extends ContentProvider { } else { id = entry.getParent(); } - cursor.addRow(new Object[]{entry.getId().hashCode(), entry.getTitle(), entry.getArtist(), "so-" + id, entry.getTitle(), icon}); + + String artistDisplay; + if(entry.getArtist() == null) { + if(entry.getAlbum() != null) { + artistDisplay = entry.getAlbumDisplay(); + } else { + artistDisplay = ""; + } + } else if(entry.getAlbum() != null) { + artistDisplay = entry.getArtist() + " - " + entry.getAlbumDisplay(); + } else { + artistDisplay = entry.getArtist(); + } + + cursor.addRow(new Object[]{entry.getId().hashCode(), entry.getTitle(), artistDisplay, "so-" + id, entry.getTitle(), icon}); } } } |