aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-03-10 14:29:03 -0700
committerScott Jackson <daneren2005@gmail.com>2014-03-10 14:29:03 -0700
commit6d51347c27c462f32291aaef6747cf9a9f7a061a (patch)
tree9757fa993859886c8686f41b7e376b843bcee3ce
parent8a56e4e5ad997c513c04fed0f3ad9af5b79fe23a (diff)
downloaddsub-6d51347c27c462f32291aaef6747cf9a9f7a061a.tar.gz
dsub-6d51347c27c462f32291aaef6747cf9a9f7a061a.tar.bz2
dsub-6d51347c27c462f32291aaef6747cf9a9f7a061a.zip
#307 Fix genres with albums == 0, songs > 20
-rw-r--r--src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java2
-rw-r--r--src/github/daneren2005/dsub/view/AlbumListAdapter.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index a132d847..c7544b64 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -503,7 +503,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
} else if(("genres".equals(albumListType) && Util.checkServerVersion(context, "1.10.0")) || "years".equals(albumListType)) {
result = service.getAlbumList(albumListType, albumListExtra, size, 0, context, this);
if(result.getChildrenSize() == 0 && "genres".equals(albumListType)) {
- result = service.getSongsByGenre(albumListExtra, size, 0, context, this);
+ result = service.getSongsByGenre("genres-songs", size, 0, context, this);
}
} else if("genres".equals(albumListType)) {
result = service.getSongsByGenre(albumListExtra, size, 0, context, this);
diff --git a/src/github/daneren2005/dsub/view/AlbumListAdapter.java b/src/github/daneren2005/dsub/view/AlbumListAdapter.java
index 1180b5c8..f5f3e5fc 100644
--- a/src/github/daneren2005/dsub/view/AlbumListAdapter.java
+++ b/src/github/daneren2005/dsub/view/AlbumListAdapter.java
@@ -57,7 +57,7 @@ public class AlbumListAdapter extends EndlessAdapter {
MusicDirectory result;
if(("genres".equals(type) && Util.checkServerVersion(context, "1.10.0")) || "years".equals(type)) {
result = service.getAlbumList(type, extra, size, offset, context, null);
- } else if("genres".equals(type)) {
+ } else if("genres".equals(type) || "genres-songs".equals(type)) {
result = service.getSongsByGenre(extra, size, offset, context, null);
} else {
result = service.getAlbumList(type, size, offset, context, null);