diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index 99f3bcc00..a4e661f62 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -355,7 +355,7 @@ public class OnlineFeedViewActivity extends AppCompatActivity { */ private void beforeShowFeedInformation(Feed feed) { final HtmlToPlainText formatter = new HtmlToPlainText(); - if(Feed.TYPE_ATOM1.equals(feed.getType())) { + if(Feed.TYPE_ATOM1.equals(feed.getType()) && feed.getDescription() != null) { // remove HTML tags from descriptions Log.d(TAG, "Removing HTML from feed description"); Document feedDescription = Jsoup.parse(feed.getDescription()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java index 8c8e8f029..1d57d902c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java @@ -1063,7 +1063,7 @@ public final class DBReader { // reverse natural order: podcast with most unplayed episodes first return -1; } else if(counterLhs == counterRhs) { - return lhs.getTitle().toLowerCase().compareTo(rhs.getTitle().toLowerCase()); + return lhs.getTitle().compareToIgnoreCase(rhs.getTitle()); } else { return 1; } @@ -1077,7 +1077,7 @@ public final class DBReader { } else if(t2 == null) { return -1; } else { - return t1.toLowerCase().compareTo(t2.toLowerCase()); + return t1.compareToIgnoreCase(t2); } }; } else { diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java index 90f5f5f20..cfb20d578 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java +++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java @@ -220,7 +220,7 @@ public class NSAtom extends Namespace { if (currentName == null) { state.getFeed().setAuthor(content); } else { - state.getFeed().setAuthor(currentName + "\n" + content); + state.getFeed().setAuthor(currentName + ", " + content); } } } |