1 files changed, 4 insertions, 6 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 3c3f7f01c..610490298 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -165,7 +165,7 @@ public class QueueFragment extends Fragment {
             case MOVED:
                 int from = FeedItemUtil.indexOfItemWithId(queue, event.item.getId());
                 int to = event.position;
-                Collections.swap(queue, from, to);
+                queue.add(to, queue.remove(from));
                 recyclerAdapter.notifyItemMoved(from, to);
                 break;
         }
@@ -327,11 +327,9 @@ public class QueueFragment extends Fragment {
         if(!isVisible()) {
             return false;
         }
-        int pos = recyclerAdapter.getPosition();
-        FeedItem selectedItem = itemAccess.getItem(pos);
-
+        FeedItem selectedItem = recyclerAdapter.getSelectedItem();
         if (selectedItem == null) {
-            Log.i(TAG, "Selected item at position " + pos + " was null, ignoring selection");
+            Log.i(TAG, "Selected item was null, ignoring selection");
             return super.onContextItemSelected(item);
         }
 
@@ -367,7 +365,7 @@ public class QueueFragment extends Fragment {
                     int from = viewHolder.getAdapterPosition();
                     int to = target.getAdapterPosition();
                     Log.d(TAG, "move(" + from + ", " + to + ")");
-                    Collections.swap(queue, from, to);
+                    queue.add(to, queue.remove(from));
                     recyclerAdapter.notifyItemMoved(from, to);
                     DBWriter.moveQueueItem(from, to, false);
                     return true;