aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/src/github
diff options
context:
space:
mode:
Diffstat (limited to 'subsonic-android/src/github')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java3
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java8
2 files changed, 5 insertions, 6 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index ff63aae9..297bd6f4 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -503,12 +503,11 @@ public class SubsonicTabActivity extends SherlockActivity {
}
public void displaySongInfo(final MusicDirectory.Entry song) {
-
String msg = "";
if(!song.isVideo()) {
msg += "Artist: " + song.getArtist() + "\nAlbum: " + song.getAlbum();
}
- if(song.getGenre() != null && !song.getGenre().isEmpty()) {
+ if(song.getGenre() != null && !"".equals(song.getGenre())) {
msg += "\nGenre: " + song.getGenre();
}
if(song.getYear() != null && song.getYear() != 0) {
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
index bf22521d..e1f694e6 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -502,19 +502,19 @@ public class RESTMusicService implements MusicService {
names.add("size");
values.add(size);
- if (musicFolderId != null && musicFolderId != "") {
+ if (musicFolderId != null && !"".equals(musicFolderId)) {
names.add("musicFolderId");
values.add(musicFolderId);
}
- if(genre != null && !genre.isEmpty()) {
+ if(genre != null && !"".equals(genre)) {
names.add("genre");
values.add(genre);
}
- if(startYear != null && !startYear.isEmpty()) {
+ if(startYear != null && !"".equals(startYear)) {
names.add("fromYear");
values.add(startYear);
}
- if(endYear != null && !endYear.isEmpty()) {
+ if(endYear != null && !"".equals(endYear)) {
names.add("toYear");
values.add(endYear);
}