Merge pull request #2607 from ByteHamster/content-encoded

Fixes empty contentEncoded

1 files changed, 10 insertions, 1 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 7b387b1d3..87298d4c3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.core.feed;
 import android.database.Cursor;
 import android.support.annotation.Nullable;
 
+import android.text.TextUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -372,7 +373,15 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
             if (contentEncoded == null || description == null) {
                 DBReader.loadExtraInformationOfFeedItem(FeedItem.this);
             }
-            return (contentEncoded != null) ? contentEncoded : description;
+            if (TextUtils.isEmpty(contentEncoded)) {
+                return description;
+            } else if (TextUtils.isEmpty(description)) {
+                return contentEncoded;
+            } else if (description.length() > 1.25 * contentEncoded.length()) {
+                return description;
+            } else {
+                return contentEncoded;
+            }
         };
     }