diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java | 4 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java index 0d17e3faa..d078ec1d1 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java @@ -260,7 +260,9 @@ public class Feed extends FeedFile implements ImageResource { @Override public String getHumanReadableIdentifier() { - if (feedTitle != null) { + if (!TextUtils.isEmpty(customTitle)) { + return customTitle; + } else if (!TextUtils.isEmpty(feedTitle)) { return feedTitle; } else { return download_url; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java index cf0502c92..87b92c1e4 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java @@ -459,15 +459,12 @@ public class DownloadService extends Service { Downloader downloader = downloaderFactory.create(request); if (downloader != null) { numberOfDownloads.incrementAndGet(); - // smaller rss feeds before bigger media files - if (request.getFeedfileType() == Feed.FEEDFILETYPE_FEED) { - downloads.add(0, downloader); - } else { - if (isEnqueued(request, itemsEnqueued)) { - request.setMediaEnqueued(true); - } - downloads.add(downloader); + + if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA + && isEnqueued(request, itemsEnqueued)) { + request.setMediaEnqueued(true); } + downloads.add(downloader); downloadExecutor.submit(downloader); postDownloaders(); |