From 6d51347c27c462f32291aaef6747cf9a9f7a061a Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 10 Mar 2014 14:29:03 -0700 Subject: #307 Fix genres with albums == 0, songs > 20 --- src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 2 +- src/github/daneren2005/dsub/view/AlbumListAdapter.java | 2 +- 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); -- cgit v1.2.3