1 files changed, 63 insertions, 52 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
index 31b405329..19aabfc88 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -28,6 +28,10 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.joanzapata.iconify.Iconify;
 
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
@@ -41,6 +45,7 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LangUtils;
+import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText;
 import de.danoeh.antennapod.menuhandler.FeedMenuHandler;
 import rx.Observable;
 import rx.Subscription;
@@ -51,11 +56,10 @@ import rx.schedulers.Schedulers;
  * Displays information about a feed.
  */
 public class FeedInfoActivity extends AppCompatActivity {
-    private static final String TAG = "FeedInfoActivity";
-    private boolean autoDeleteChanged = false;
 
     public static final String EXTRA_FEED_ID = "de.danoeh.antennapod.extra.feedId";
-
+    private static final String TAG = "FeedInfoActivity";
+    private boolean autoDeleteChanged = false;
     private Feed feed;
 
     private ImageView imgvCover;
@@ -78,6 +82,7 @@ public class FeedInfoActivity extends AppCompatActivity {
 
     private Subscription subscription;
 
+
     private final View.OnClickListener copyUrlToClipboard = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -99,6 +104,40 @@ public class FeedInfoActivity extends AppCompatActivity {
         }
     };
 
+    private boolean authInfoChanged = false;
+
+    private TextWatcher authTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            authInfoChanged = true;
+        }
+    };
+
+    private boolean filterTextChanged = false;
+
+    private TextWatcher filterTextWatcher = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            filterTextChanged = true;
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
@@ -157,8 +196,19 @@ public class FeedInfoActivity extends AppCompatActivity {
                             .into(imgvCover);
 
                     txtvTitle.setText(feed.getTitle());
+
                     String description = feed.getDescription();
-                    txtvDescription.setText((description != null) ? description.trim() : "");
+                    if(description != null) {
+                        if(Feed.TYPE_ATOM1.equals(feed.getType())) {
+                            HtmlToPlainText formatter = new HtmlToPlainText();
+                            Document feedDescription = Jsoup.parse(feed.getDescription());
+                            description = StringUtils.trim(formatter.getPlainText(feedDescription));
+                        }
+                    } else {
+                        description = "";
+                    }
+                    txtvDescription.setText(description);
+
                     if (!TextUtils.isEmpty(feed.getAuthor())) {
                         txtvAuthor.setText(feed.getAuthor());
                     } else {
@@ -251,53 +301,6 @@ public class FeedInfoActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if(subscription != null) {
-            subscription.unsubscribe();
-        }
-    }
-
-
-    private boolean authInfoChanged = false;
-
-    private TextWatcher authTextWatcher = new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            authInfoChanged = true;
-        }
-    };
-
-    private boolean filterTextChanged = false;
-
-    private TextWatcher filterTextWatcher = new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            filterTextChanged = true;
-        }
-    };
-
-    @Override
     protected void onPause() {
         super.onPause();
         if (feed != null) {
@@ -329,6 +332,14 @@ public class FeedInfoActivity extends AppCompatActivity {
     }
 
     @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if(subscription != null) {
+            subscription.unsubscribe();
+        }
+    }
+
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
@@ -379,7 +390,7 @@ public class FeedInfoActivity extends AppCompatActivity {
         private final Feed feed;
         private final boolean autoDownload;
 
-        public ApplyToEpisodesDialog(Context context, Feed feed, boolean autoDownload) {
+        ApplyToEpisodesDialog(Context context, Feed feed, boolean autoDownload) {
             super(context, R.string.auto_download_apply_to_items_title,
                     R.string.auto_download_apply_to_items_message);
             this.feed = feed;