summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2022-03-04 19:43:50 +0100
committerGitHub <noreply@github.com>2022-03-04 19:43:50 +0100
commit36b6c46d822fc6a6aa862b111eda62a564cafe94 (patch)
tree7db80a0ff4d714a14677ca9bf1f88fdc7f9b7fd3 /core
parent42e36328e3bb6d4bda632da7586fdace912a34e0 (diff)
parent53b32cc8bf248ce64581185a78e68d801d45f2cf (diff)
downloadAntennaPod-36b6c46d822fc6a6aa862b111eda62a564cafe94.zip
Merge pull request #5762 from ByteHamster/download-error-title
Use feed url in error messages when no title is available
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java2
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java4
2 files changed, 3 insertions, 3 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 48a9e8017..54140b5bf 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
@@ -118,7 +118,7 @@ public class DownloadServiceNotification {
continue;
}
sb.append("• ").append(statuses.get(i).getTitle());
- sb.append(": ").append(DownloadErrorLabel.from(statuses.get(i).getReason()));
+ sb.append(": ").append(context.getString(DownloadErrorLabel.from(statuses.get(i).getReason())));
if (i != statuses.size() - 1) {
sb.append("\n");
}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
index 7e3b07880..434eff2c3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/FeedParserTask.java
@@ -84,8 +84,8 @@ public class FeedParserTask implements Callable<FeedHandlerResult> {
successful, reasonDetailed, request.isInitiatedByUser());
return result;
} else {
- downloadStatus = new DownloadStatus(feed, feed.getTitle(), reason, successful,
- reasonDetailed, request.isInitiatedByUser());
+ downloadStatus = new DownloadStatus(feed, feed.getHumanReadableIdentifier(), reason,
+ successful, reasonDetailed, request.isInitiatedByUser());
return null;
}
}