From 1bbaf7dbd35e58e599313f96a09cf0b5cf766731 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 13 Apr 2014 09:14:47 -0700 Subject: Fix clicking download intent not labeling current drawer correctly --- src/github/daneren2005/dsub/activity/SubsonicActivity.java | 4 +++- src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/github/daneren2005') diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 58069df7..7d971093 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -417,7 +417,9 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(!chatEnabled) { drawerItemsVisibleList.set(6, false); } - drawerItemsVisibleList.set(7, false); + if(!getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW)) { + drawerItemsVisibleList.set(7, false); + } drawerList.setAdapter(drawerAdapter = new DrawerAdapter(this, drawerItemsList, drawerItemsIconsList, drawerItemsVisibleList)); enabledItems[0] = podcastsEnabled; diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 2eed719f..eee53d71 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -88,6 +88,9 @@ public class SubsonicFragmentActivity extends SubsonicActivity { getImageLoader().clearCache(); } else if(getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW)) { getIntent().putExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE, "Download"); + if(drawerAdapter != null) { + drawerAdapter.setDownloadVisible(true); + } } else if(getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD)) { DownloadService service = getDownloadService(); if((service != null && service.getCurrentPlaying() != null)) { -- cgit v1.2.3