Merge branch 'master' of https://github.com/camilstaps/RSSin

2 files changed, 7 insertions, 7 deletions

diff --git a/app/src/main/java/org/rssin/rss/Feed.java b/app/src/main/java/org/rssin/rss/Feed.java
index cda5bf6..b9b29b7 100644
--- a/app/src/main/java/org/rssin/rss/Feed.java
+++ b/app/src/main/java/org/rssin/rss/Feed.java
@@ -4,6 +4,7 @@ import android.widget.EditText;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 
@@ -18,7 +19,7 @@ public class Feed {
     private String description;
     private String link;
     private String author;
-    private String category;
+    private List<String> category = new LinkedList<>();
     private String comments;
     private String enclosure;
     private String source;
@@ -26,7 +27,7 @@ public class Feed {
     private List<FeedItem> posts = new ArrayList<>();
 
     public Feed (String guid, Date pubDate, String title, String description, String link,
-                    String author, String category, String comments, String enclosure, String source)
+                    String author, List<String> category, String comments, String enclosure, String source)
     {
         this.guid = guid;
         this.pubDate = pubDate;
@@ -69,13 +70,11 @@ public class Feed {
         return author;
     }
 
-    public String getCategory() {
+    public List<String> getCategory() {
         return category;
     }
 
-    public String getComments() {
-        return comments;
-    }
+    public String getComments() { return comments; }
 
     public String getEnclosure() {
         return enclosure;
diff --git a/app/src/main/java/org/rssin/rss/FeedLoader.java b/app/src/main/java/org/rssin/rss/FeedLoader.java
index c26603d..f1ab72e 100644
--- a/app/src/main/java/org/rssin/rss/FeedLoader.java
+++ b/app/src/main/java/org/rssin/rss/FeedLoader.java
@@ -4,6 +4,7 @@ import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Date;
+import java.util.LinkedList;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -35,7 +36,7 @@ public class FeedLoader {
                 switch (event) {
                     case XmlPullParser.START_TAG:
                         post = new FeedItem(null, null, null, null, null,
-                                null, null, null, null, null);
+                                null, new LinkedList<String>(), null, null, null);
                         break;
                     case XmlPullParser.TEXT:
                         text = myParser.getText();