Move "Delete Removes from Queue" logic to DBWriter

4 files changed, 0 insertions, 14 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 64b6f8bf1..07a64cde8 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -26,7 +26,6 @@ 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;
@@ -450,9 +449,6 @@ 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/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index eb3283400..7c28ba21f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -17,7 +17,6 @@ import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
@@ -170,9 +169,6 @@ public class CompletedDownloadsFragment extends ListFragment {
         @Override
         public void onFeedItemSecondaryAction(FeedItem item) {
             DBWriter.deleteFeedMediaOfItem(getActivity(), item.getMedia().getId());
-            if (UserPreferences.shouldDeleteRemoveFromQueue()) {
-                DBWriter.removeQueueItem(getActivity(), item, false);
-            }
         }
     };
 
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 4cd9b5f4b..c1d9bb9ab 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -248,9 +248,6 @@ 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/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index c8705185b..321b9c7bb 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -165,9 +165,6 @@ public class FeedItemMenuHandler {
                 break;
             case R.id.remove_item:
                 DBWriter.deleteFeedMediaOfItem(context, selectedItem.getMedia().getId());
-                if (UserPreferences.shouldDeleteRemoveFromQueue()) {
-                    DBWriter.removeQueueItem(context, selectedItem, false);
-                }
                 break;
             case R.id.mark_read_item:
                 selectedItem.setPlayed(true);