diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-01-15 22:13:59 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-01-15 22:13:59 -0800 |
commit | c190b724a5c73217825aaf4b8adedf823a1248f5 (patch) | |
tree | c61a131de11cef257e40dcf4e125bcc407d30728 | |
parent | 5790bc70ec2f6c924af35c63cb8e57fbaab33ab3 (diff) | |
parent | 273ee9958c2581bca283d5b4895395818a5d64b6 (diff) | |
download | dsub-c190b724a5c73217825aaf4b8adedf823a1248f5.tar.gz dsub-c190b724a5c73217825aaf4b8adedf823a1248f5.tar.bz2 dsub-c190b724a5c73217825aaf4b8adedf823a1248f5.zip |
Merge branch 'master' into DLNA
-rw-r--r-- | src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 4 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/view/HeaderGridView.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 7342fc79..ba884503 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -680,7 +680,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter }
// If artist, we want to load the artist info to use later
- if(artist) {
+ if(artist && ServerInfo.checkServerVersion(context, "1.11")) {
artistInfo = musicService.getArtistInfo(id, refresh, context, this);
}
@@ -698,7 +698,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter // Show header if not album list type and not root and not artist
// For Subsonic 5.1+ display a header for artists with getArtistInfo data if it exists
View header = null;
- if(albumListType == null && !"root".equals(id) && (!artist || (ServerInfo.checkServerVersion(context, "1.11") && artistInfo != null))) {
+ if(albumListType == null && !"root".equals(id) && (!artist || artistInfo != null)) {
header = createHeader();
// Only add header to entry list if we aren't going recreate album grid as root anyways
if(header != null && entryList != null && (!addAlbumHeader || entries.size() > 0)) {
diff --git a/src/github/daneren2005/dsub/view/HeaderGridView.java b/src/github/daneren2005/dsub/view/HeaderGridView.java index cd57dc0e..3ae39c88 100644 --- a/src/github/daneren2005/dsub/view/HeaderGridView.java +++ b/src/github/daneren2005/dsub/view/HeaderGridView.java @@ -410,7 +410,7 @@ public class HeaderGridView extends GridView { * <p>This is intended as a base class; you will probably not need to * use this class directly in your own code. */ - private static class HeaderViewGridAdapter implements WrapperListAdapter, Filterable { + private static class HeaderViewGridAdapter extends BaseAdapter implements WrapperListAdapter, Filterable { // This is used to notify the container of updates relating to number of columns // or headers changing, which changes the number of placeholders needed private final DataSetObservable mDataSetObservable = new DataSetObservable(); |