diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-05-02 09:52:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 09:52:30 +0200 |
| commit | c3a0e228ccdaf71876f7a6a583200a66cea40a7b (patch) | |
| tree | 3a64e4d68bf8c6fbc518391a7fbb79cae14a5e9d | |
| parent | c59133d8c96ed552d3cce61117b661f28a0ba9e7 (diff) | |
| parent | 78db02d7a7f39c97e7ed8ec44e7adc03508a979c (diff) | |
| download | AntennaPod-c3a0e228ccdaf71876f7a6a583200a66cea40a7b.zip | |
Merge pull request #5140 from ByteHamster/dont-mark-played
Don't mark episodes as played when removing from queue
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 12 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 2 |
2 files changed, 3 insertions, 11 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 5b53949e4..1fda42d41 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -490,19 +490,13 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi final int position = viewHolder.getAdapterPosition(); Log.d(TAG, "remove(" + position + ")"); final FeedItem item = queue.get(position); - final boolean isRead = item.isPlayed(); - DBWriter.markItemPlayed(FeedItem.PLAYED, false, item.getId()); DBWriter.removeQueueItem(getActivity(), true, item); ((MainActivity) getActivity()).showSnackbarAbovePlayer( - item.hasMedia() ? R.string.marked_as_read_label : R.string.marked_as_read_no_media_label, + getResources().getQuantityString(R.plurals.removed_from_queue_batch_label, 1, 1), Snackbar.LENGTH_LONG) - .setAction(getString(R.string.undo), v -> { - DBWriter.addQueueItemAt(getActivity(), item.getId(), position, false); - if (!isRead) { - DBWriter.markItemPlayed(FeedItem.UNPLAYED, item.getId()); - } - }); + .setAction(getString(R.string.undo), v -> + DBWriter.addQueueItemAt(getActivity(), item.getId(), position, false)); } @Override diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index a037ac7a4..7da4cf39c 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -197,9 +197,7 @@ <string name="remove_new_flag_label">Remove \"new\" flag</string> <string name="removed_new_flag_label">Removed \"new\" flag</string> <string name="mark_read_label">Mark as played</string> - <string name="marked_as_read_label">Marked as played</string> <string name="mark_read_no_media_label">Mark as read</string> - <string name="marked_as_read_no_media_label">Marked as read</string> <string name="play_this_to_seek_position">To jump to positions, you need to play the episode</string> <plurals name="marked_read_batch_label"> <item quantity="one">%d episode marked as played.</item> |