Merge pull request #2191 from Cj-Malone/youtube-fix

Youtube fix
This commit is contained in:
Martin Fietz 2016-11-27 09:14:10 +01:00 committed by GitHub
commit f9f4df466c
3 changed files with 4 additions and 4 deletions

View File

@ -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());

View File

@ -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 {

View File

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