diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-04-13 09:14:47 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-04-13 09:14:47 -0700 |
commit | 1bbaf7dbd35e58e599313f96a09cf0b5cf766731 (patch) | |
tree | 6d53a72ae070ecdb142d1712d03db51671ae4dbf /src | |
parent | 0e35e171558c07df14a4fe8c9cd4c00d9ffb6c8c (diff) | |
download | dsub-1bbaf7dbd35e58e599313f96a09cf0b5cf766731.tar.gz dsub-1bbaf7dbd35e58e599313f96a09cf0b5cf766731.tar.bz2 dsub-1bbaf7dbd35e58e599313f96a09cf0b5cf766731.zip |
Fix clicking download intent not labeling current drawer correctly
Diffstat (limited to 'src')
-rw-r--r-- | src/github/daneren2005/dsub/activity/SubsonicActivity.java | 4 | ||||
-rw-r--r-- | src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java | 3 |
2 files changed, 6 insertions, 1 deletions
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)) {
|