From cb91f020ed26ffa1b096db5c24ce48f53e461b01 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 17 Oct 2012 19:29:01 -0700 Subject: Don't let users press shuffle or save playlist when on downloads list --- .../src/github/daneren2005/dsub/activity/DownloadActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'subsonic-android') 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); -- cgit v1.2.3