Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Petar Kukolj 2018-12-02 00:13:30 +01:00
parent a1f81d4144
commit 9c43438cbe
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
View File

@ -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();

3
app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
View File

@ -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());

8
app/src/main/res/menu/feeditemlist_context.xml
View File

@ -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"

8
app/src/main/res/menu/queue_context.xml
View File

@ -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"