Don't crash when download log entry is incomplete

1 files changed, 9 insertions, 5 deletions

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 b80a20a25..44a30da81 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
@@ -117,7 +117,9 @@ public class DownloadServiceNotification {
                 continue;
             }
             sb.append("• ").append(statuses.get(i).getTitle());
-            sb.append(": ").append(statuses.get(i).getReason().getErrorString(context));
+            if (statuses.get(i).getReason() != null) {
+                sb.append(": ").append(statuses.get(i).getReason().getErrorString(context));
+            }
             if (i != statuses.size() - 1) {
                 sb.append("\n");
             }
@@ -134,16 +136,18 @@ public class DownloadServiceNotification {
     public void updateReport(List<DownloadStatus> reportQueue, boolean showAutoDownloadReport) {
         // check if report should be created
         boolean createReport = false;
-        int successfulDownloads = 0;
         int failedDownloads = 0;
 
         // a download report is created if at least one download has failed
         // (excluding failed image downloads)
         for (DownloadStatus status : reportQueue) {
+            if (status == null || status.isCancelled()) {
+                continue;
+            }
             if (status.isSuccessful()) {
-                successfulDownloads++;
-                createReport |= showAutoDownloadReport && !status.isInitiatedByUser() && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA;
-            } else if (!status.isCancelled()) {
+                createReport |= showAutoDownloadReport && !status.isInitiatedByUser()
+                        && status.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA;
+            } else {
                 failedDownloads++;
                 createReport = true;
             }