From 0d21dbed4cc253dda1499779485aca4bd34b9c15 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 6 Mar 2021 21:50:34 +0100 Subject: Fixed 2 little bugs related to queue movement - moving while downloading sometimes caused ArrayIndexOutOfBoundsException - Long-pressing and then swiping out leaves the screen empty and the context menu open. Pressing items crashed the app. --- app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java') 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 2850acc15..b92043c7d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -385,7 +385,7 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi @Override public boolean onContextItemSelected(MenuItem item) { Log.d(TAG, "onContextItemSelected() called with: " + "item = [" + item + "]"); - if(!isVisible()) { + if (!isVisible() || recyclerAdapter == null) { return false; } FeedItem selectedItem = recyclerAdapter.getSelectedItem(); @@ -464,7 +464,7 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi int from = viewHolder.getAdapterPosition(); int to = target.getAdapterPosition(); Log.d(TAG, "move(" + from + ", " + to + ") in memory"); - if (from >= queue.size() || to >= queue.size()) { + if (from >= queue.size() || to >= queue.size() || from < 0 || to < 0) { return false; } queue.add(to, queue.remove(from)); -- cgit v1.2.3