FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Json feed format now works !

Browse Source
This commit is contained in:
Shinokuni 2019-04-29 11:44:02 +02:00
parent aeb4994c2a
commit 49e4b3e12f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/readrops/app/database/entities/Feed.java
View File

@ -237,11 +237,13 @@ public class Feed implements Parcelable {
feed.setName(jsonFeed.getTitle()); feed.setName(jsonFeed.getTitle());
feed.setUrl(jsonFeed.getFeedUrl()); feed.setUrl(jsonFeed.getFeedUrl());
feed.setSiteUrl(jsonFeed.getHomePageUrl());
feed.setDescription(jsonFeed.getDescription()); feed.setDescription(jsonFeed.getDescription());
//feed.setLastUpdated(jsonFeed.); maybe later ? //feed.setLastUpdated(jsonFeed.); maybe later ?
feed.setEtag(jsonFeed.getEtag()); feed.setEtag(jsonFeed.getEtag());
feed.setLastModified(jsonFeed.getLastModified()); feed.setLastModified(jsonFeed.getLastModified());
feed.setIconUrl(jsonFeed.getFaviconUrl());
feed.setFolderId(1); feed.setFolderId(1);

4
app/src/main/java/com/readrops/app/database/entities/Item.java
View File

@ -275,7 +275,9 @@ public class Item implements Comparable<Item> {
for (JSONItem item : items) { for (JSONItem item : items) {
Item dbItem = new Item(); Item dbItem = new Item();
dbItem.setAuthor(item.getAuthor().getName()); if (item.getAuthor() != null)
dbItem.setAuthor(item.getAuthor().getName());
dbItem.setContent(item.getContent()); dbItem.setContent(item.getContent());
dbItem.setDescription(item.getSummary()); dbItem.setDescription(item.getSummary());
dbItem.setGuid(item.getId()); dbItem.setGuid(item.getId());

8
app/src/main/java/com/readrops/app/repositories/ARepository.java
View File

@ -66,7 +66,13 @@ public abstract class ARepository {
} }
protected void setFavIconUtils(Feed feed) throws IOException { protected void setFavIconUtils(Feed feed) throws IOException {
String favUrl = HtmlParser.getFaviconLink(feed.getSiteUrl()); String favUrl;
if (feed.getIconUrl() != null)
favUrl = feed.getIconUrl();
else
favUrl = HtmlParser.getFaviconLink(feed.getSiteUrl());
if (favUrl != null && Patterns.WEB_URL.matcher(favUrl).matches()) { if (favUrl != null && Patterns.WEB_URL.matcher(favUrl).matches()) {
feed.setIconUrl(favUrl); feed.setIconUrl(favUrl);
setFeedColors(favUrl, feed); setFeedColors(favUrl, feed);