summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/dialog
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2020-01-09 17:06:11 +0100
committerGitHub <noreply@github.com>2020-01-09 17:06:11 +0100
commit34f19ed967d4a6474c3928a36deb1c25935dfa53 (patch)
tree361e3b1ba92609936b0a9a41763ae2a4e7d141a1 /app/src/main/java/de/danoeh/antennapod/dialog
parent7f402168b7d51999dfe73058115e6184ee1ffb90 (diff)
parentf615b38d84c1bbffa6e3f2b3c306103065a6e122 (diff)
downloadAntennaPod-34f19ed967d4a6474c3928a36deb1c25935dfa53.zip
Merge branch 'develop' into do-not-allocate-arrays
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/dialog')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java6
1 files changed, 3 insertions, 3 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 100e33e0f..d583c0e1e 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
@@ -51,7 +51,7 @@ public class EpisodesApplyActionFragment extends Fragment {
public static final int ACTION_REMOVE_FROM_QUEUE = 2;
private static final int ACTION_MARK_PLAYED = 4;
private static final int ACTION_MARK_UNPLAYED = 8;
- private static final int ACTION_DOWNLOAD = 16;
+ public static final int ACTION_DOWNLOAD = 16;
public static final int ACTION_DELETE = 32;
private static final int ACTION_ALL = ACTION_ADD_TO_QUEUE | ACTION_REMOVE_FROM_QUEUE
| ACTION_MARK_PLAYED | ACTION_MARK_UNPLAYED | ACTION_DOWNLOAD | ACTION_DELETE;
@@ -480,7 +480,7 @@ public class EpisodesApplyActionFragment extends Fragment {
// download the check episodes in the same order as they are currently displayed
List<FeedItem> toDownload = new ArrayList<>(checkedIds.size());
for(FeedItem episode : episodes) {
- if(checkedIds.contains(episode.getId())) {
+ if(checkedIds.contains(episode.getId()) && episode.hasMedia()) {
toDownload.add(episode);
}
}
@@ -490,7 +490,7 @@ public class EpisodesApplyActionFragment extends Fragment {
e.printStackTrace();
DownloadRequestErrorDialogCreator.newRequestErrorDialog(getActivity(), e.getMessage());
}
- close(R.plurals.downloading_batch_label, checkedIds.size());
+ close(R.plurals.downloading_batch_label, toDownload.size());
}
private void deleteChecked() {