aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-05-30 17:41:21 -0500
committerScott Jackson <daneren2005@gmail.com>2016-05-30 17:41:21 -0500
commit2a2e6d5c57b45bba59dce6716fc01b1a1b0cc1a4 (patch)
tree8a16d2768a39e90aaa4234e0b9f6cbf111191df2 /app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
parenteaca7e8c966cb085096486b7e1d27e349e7c7aa8 (diff)
downloaddsub-2a2e6d5c57b45bba59dce6716fc01b1a1b0cc1a4.tar.gz
dsub-2a2e6d5c57b45bba59dce6716fc01b1a1b0cc1a4.tar.bz2
dsub-2a2e6d5c57b45bba59dce6716fc01b1a1b0cc1a4.zip
Remove "Root" folder concept now that we can trivially display artists and songs side by side
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 67dcc6a2..67bc2565 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -234,7 +234,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
if(!ServerInfo.hasTopSongs(context)) {
menu.removeItem(R.id.menu_top_tracks);
}
- if(!ServerInfo.checkServerVersion(context, "1.11") || (id != null && "root".equals(id))) {
+ if(!ServerInfo.checkServerVersion(context, "1.11") || id != null) {
menu.removeItem(R.id.menu_radio);
menu.removeItem(R.id.menu_similar_artists);
} else if(!ServerInfo.hasSimilarArtists(context)) {
@@ -379,9 +379,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
@Override
protected void refresh(boolean refresh) {
- if(!"root".equals(id)) {
- load(refresh);
- }
+ load(refresh);
}
@Override
@@ -751,7 +749,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
// 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
boolean addedHeader = false;
- if(albumListType == null && !"root".equals(id) && (!artist || artistInfo != null || artistInfoDelayed != null) && (share == null || entries.size() != albums.size())) {
+ if(albumListType == null && (!artist || artistInfo != null || artistInfoDelayed != null) && (share == null || entries.size() != albums.size())) {
View header = createHeader();
if(header != null) {