aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-09-23 17:16:26 -0700
committerScott Jackson <daneren2005@gmail.com>2015-09-23 17:16:26 -0700
commitf9dd3ded43829e883e747a96c8523e74b4ea8d17 (patch)
tree77537e7949a6b92ef526f296ef47e6e01cda7257 /app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
parent133aa31b1d36b9d7a7885fede29f0d3501e2c9ab (diff)
downloaddsub-f9dd3ded43829e883e747a96c8523e74b4ea8d17.tar.gz
dsub-f9dd3ded43829e883e747a96c8523e74b4ea8d17.tar.bz2
dsub-f9dd3ded43829e883e747a96c8523e74b4ea8d17.zip
Put back a bunch of context menu options and make everything optional
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 68ade3cc..f312675f 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -555,15 +555,20 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
menu.findItem(R.id.menu_show_artist).setVisible(false);
}
- MenuUtil.hideMenuItems(context, menu);
+ MenuUtil.hideMenuItems(context, menu, updateView);
}
@Override
public boolean onContextItemSelected(MenuItem menuItem, UpdateView<DownloadFile> updateView, DownloadFile downloadFile) {
+ if(onContextItemSelected(menuItem, downloadFile)) {
+ return true;
+ }
+
return menuItemSelected(menuItem.getItemId(), downloadFile);
}
private boolean menuItemSelected(int menuItemId, final DownloadFile song) {
+ List<Entry> songs;
switch (menuItemId) {
case R.id.menu_show_album: case R.id.menu_show_artist:
Entry entry = song.getSong();
@@ -629,11 +634,6 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
replaceFragment(fragment);
return true;
}
- case R.id.menu_delete:
- List<Entry> songs = new ArrayList<Entry>(1);
- songs.add(song.getSong());
- getDownloadService().delete(songs);
- return true;
case R.id.menu_remove_all:
Util.confirmDialog(context, R.string.download_menu_remove_all, "", new DialogInterface.OnClickListener() {
@Override