summaryrefslogtreecommitdiff
path: root/core/src/main/java/de/danoeh
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2018-07-22 18:15:29 +0200
committerGitHub <noreply@github.com>2018-07-22 18:15:29 +0200
commit1b6f98203fe2048997a2029606e1e1285fd2d724 (patch)
tree5e81e73533e8347573d2dfbf6ac6d0aac7afe560 /core/src/main/java/de/danoeh
parentfc2bd0e19b723c88355100d54f840c66e0cbd308 (diff)
parent3fce9490c257ac7fa10a70b74f05d0133fbf44b7 (diff)
downloadAntennaPod-1b6f98203fe2048997a2029606e1e1285fd2d724.zip
Merge pull request #2762 from ByteHamster/feed-description
Do not overwrite feed description with item description
Diffstat (limited to 'core/src/main/java/de/danoeh')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
index 18af0800f..b3b8a40ce 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
@@ -47,6 +47,9 @@ public class NSITunes extends Namespace {
if(state.getContentBuf() == null) {
return;
}
+ SyndElement secondElement = state.getSecondTag();
+ String second = secondElement.getName();
+
if (AUTHOR.equals(localName)) {
if (state.getFeed() != null) {
String author = state.getContentBuf().toString();
@@ -95,10 +98,9 @@ public class NSITunes extends Namespace {
}
if (state.getCurrentItem() != null &&
(TextUtils.isEmpty(state.getCurrentItem().getDescription()) ||
- state.getCurrentItem().getDescription().length() * 1.25 < summary.length())
- ) {
+ state.getCurrentItem().getDescription().length() * 1.25 < summary.length())) {
state.getCurrentItem().setDescription(summary);
- } else if (state.getFeed() != null) {
+ } else if (NSRSS20.CHANNEL.equals(second) && state.getFeed() != null) {
state.getFeed().setDescription(summary);
}
}