From 037b71baa58e30093aa9d021bcf9fc16f23c4008 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 26 Aug 2014 16:38:33 -0700 Subject: Fix issue with context items referencing wrong entry --- .../daneren2005/dsub/fragments/SelectDirectoryFragment.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index bb3c061a..a8b1f96b 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -342,19 +342,19 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo(); Object selectedItem; + int headers = entryList.getHeaderViewsCount(); if(albumContext) { - selectedItem = albums.get(showHeader ? (info.position - 1) : info.position); + selectedItem = albums.get(info.position); } else { if(info.position == 0) { return false; } - info.position--; - selectedItem = entries.get(showHeader ? (info.position - 1) : info.position); + selectedItem = entries.get(info.position - headers); } if(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PLAY_NOW_AFTER, false) && menuItem.getItemId() == R.id.song_menu_play_now) { List songs = new ArrayList(); - Iterator it = entries.listIterator(info.position - 1); + Iterator it = entries.listIterator(info.position - headers); while(it.hasNext()) { songs.add((MusicDirectory.Entry) it.next()); } @@ -369,7 +369,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter switch (menuItem.getItemId()) { case R.id.song_menu_remove_playlist: - removeFromPlaylist(playlistId, playlistName, Arrays.asList(info.position - 1)); + removeFromPlaylist(playlistId, playlistName, Arrays.asList(info.position - headers)); break; case R.id.song_menu_server_download: downloadPodcastEpisode((PodcastEpisode)selectedItem); -- cgit v1.2.3