diff options
author | Scott Jackson <daneren2005@gmail.com> | 2012-10-17 19:29:01 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2012-10-17 19:29:01 -0700 |
commit | cb91f020ed26ffa1b096db5c24ce48f53e461b01 (patch) | |
tree | 15655507c240544d2390b857773e258af806e544 | |
parent | 055941814c5d52ee9690347febb4f1c8cd6a962e (diff) | |
download | dsub-cb91f020ed26ffa1b096db5c24ce48f53e461b01.tar.gz dsub-cb91f020ed26ffa1b096db5c24ce48f53e461b01.tar.bz2 dsub-cb91f020ed26ffa1b096db5c24ce48f53e461b01.zip |
Don't let users press shuffle or save playlist when on downloads list
-rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java index be955ef7..70120574 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java @@ -519,8 +519,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi public boolean onPrepareOptionsMenu(Menu menu) { MenuItem savePlaylist = menu.findItem(R.id.menu_save_playlist); boolean enabled = !Util.isOffline(this); - savePlaylist.setEnabled(enabled); - savePlaylist.setVisible(enabled); + savePlaylist.setEnabled(enabled && nowPlaying); + savePlaylist.setVisible(enabled && nowPlaying); MenuItem screenOption = menu.findItem(R.id.menu_screen_on_off); if (getDownloadService() != null && getDownloadService().getKeepScreenOn()) { screenOption.setTitle(R.string.download_menu_screen_off); @@ -530,6 +530,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi MenuItem togglePlaying = menu.findItem(R.id.menu_toggle_now_playing); togglePlaying.setVisible(enabled); togglePlaying.setTitle(nowPlaying ? R.string.download_show_downloading : R.string.download_show_now_playing); + MenuItem shuffle = menu.findItem(R.id.menu_shuffle); + shuffle.setVisible(nowPlaying); return super.onPrepareOptionsMenu(menu); } @@ -620,6 +622,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi return true; case R.id.menu_toggle_now_playing: toggleNowPlaying(); + invalidateOptionsMenu(); return true; case R.id.menu_exit: intent = new Intent(this, MainActivity.class); |