Merge pull request #5762 from ByteHamster/download-error-title

Use feed url in error messages when no title is available
This commit is contained in:
ByteHamster 2022-03-04 19:43:50 +01:00 committed by GitHub
commit 36b6c46d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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");
}

View File

@ -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;
}
}