diff options
Diffstat (limited to 'src/github/daneren2005/dsub/activity/SubsonicActivity.java')
| -rw-r--r-- | src/github/daneren2005/dsub/activity/SubsonicActivity.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index bc239b4b..77a592bb 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -375,6 +375,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte SharedPreferences prefs = Util.getPreferences(this);
boolean podcastsEnabled = prefs.getBoolean(Constants.PREFERENCES_KEY_PODCASTS_ENABLED, true);
boolean bookmarksEnabled = prefs.getBoolean(Constants.PREFERENCES_KEY_BOOKMARKS_ENABLED, true) && !Util.isOffline(this);
+ boolean sharedEnabled = prefs.getBoolean(Constants.PREFERENCES_KEY_SHARED_ENABLED, true) && !Util.isOffline(this);
boolean chatEnabled = prefs.getBoolean(Constants.PREFERENCES_KEY_CHAT_ENABLED, true) && !Util.isOffline(this);
if(drawerItems == null || !enabledItems[0] == podcastsEnabled || !enabledItems[1] == bookmarksEnabled || !enabledItems[2] == chatEnabled) {
@@ -412,15 +413,23 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte drawerItemsIconsList.remove(4 - alreadyRemoved);
alreadyRemoved++;
}
-
- // Selectively remove chat listing: [5]
- if(!chatEnabled) {
+
+ // Selectively remove shared listing [5]
+ if(!bookmarksEnabled) {
drawerItemsList.remove(5 - alreadyRemoved);
drawerItemsDescriptionsList.remove(5 - alreadyRemoved);
drawerItemsIconsList.remove(5 - alreadyRemoved);
alreadyRemoved++;
}
+ // Selectively remove chat listing: [6]
+ if(!chatEnabled) {
+ drawerItemsList.remove(6 - alreadyRemoved);
+ drawerItemsDescriptionsList.remove(6 - alreadyRemoved);
+ drawerItemsIconsList.remove(6 - alreadyRemoved);
+ alreadyRemoved++;
+ }
+
// Put list back together
if(alreadyRemoved > 0) {
drawerItems = drawerItemsList.toArray(new String[0]);
|