Make "Delete Removes From Queue" work consistently for all cases

4 files changed, 15 insertions, 8 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
index 07a64cde8..64b6f8bf1 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.core.feed.FeedItem;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
@@ -449,6 +450,9 @@ public class EpisodesApplyActionFragment extends Fragment {
             FeedItem episode = idMap.get(id);
             if(episode.hasMedia()) {
                 DBWriter.deleteFeedMediaOfItem(getActivity(), episode.getMedia().getId());
+                if (UserPreferences.shouldDeleteRemoveFromQueue()) {
+                    DBWriter.removeQueueItem(getActivity(), episode, false);
+                }
             }
         }
         close();
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index c1d9bb9ab..4cd9b5f4b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -248,6 +248,9 @@ public class ItemFragment extends Fragment implements OnSwipeGesture {
                     ((MainActivity) getActivity()).dismissChildFragment();
                 } else {
                     DBWriter.deleteFeedMediaOfItem(getActivity(), media.getId());
+                    if (UserPreferences.shouldDeleteRemoveFromQueue()) {
+                        DBWriter.removeQueueItem(getActivity(), item, false);
+                    }
                 }
             } else if (item.getLink() != null) {
                 Uri uri = Uri.parse(item.getLink());
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index 8bfb8f329..1f4f09faa 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -24,6 +24,10 @@
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/add_to_favorites_item"
@@ -47,10 +51,6 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index 4d6bc67c5..c88620665 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -26,6 +26,10 @@
         android:id="@+id/remove_from_queue_item"
         android:menuCategory="container"
         android:title="@string/remove_from_queue_label" />
+    <item
+        android:id="@+id/remove_item"
+        android:menuCategory="container"
+        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/add_to_favorites_item"
@@ -48,10 +52,6 @@
         android:id="@+id/deactivate_auto_download"
         android:menuCategory="container"
         android:title="@string/deactivate_auto_download" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
 
     <item
         android:id="@+id/visit_website_item"