Merge branch 'master' into develop

2 files changed, 3 insertions, 2 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index fc708ef6a..c085bc007 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -271,7 +271,7 @@ public class DownloadRequest implements Parcelable {
         private boolean deleteOnFailure = false;
         private final long feedfileId;
         private final int feedfileType;
-        private Bundle arguments = new Bundle();
+        private final Bundle arguments = new Bundle();
         private boolean initiatedByUser = true;
 
         public Builder(@NonNull String destination, @NonNull FeedMedia media) {
@@ -288,6 +288,7 @@ public class DownloadRequest implements Parcelable {
             this.title = feed.getHumanReadableIdentifier();
             this.feedfileId = feed.getId();
             this.feedfileType = feed.getTypeAsInt();
+            arguments.putInt(REQUEST_ARG_PAGE_NR, feed.getPageNr());
         }
 
         public Builder withInitiatedByUser(boolean initiatedByUser) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
index 96ac08c6d..e24922ab0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
@@ -132,7 +132,7 @@ public class DownloadServiceNotification {
         StringBuilder sb = new StringBuilder();
 
         for (int i = 0; i < statuses.size(); i++) {
-            if (statuses.get(i).isSuccessful()) {
+            if (statuses.get(i) == null || statuses.get(i).isSuccessful()) {
                 continue;
             }
             sb.append("• ").append(statuses.get(i).getTitle());