From d9652c725b54273ba8c3b4c35f1b45c17dec3f91 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Tue, 14 Jul 2020 15:13:46 +0200 Subject: [PATCH] Handle the absence of guid tag for RSS 2.0 items --- .../main/java/com/readrops/app/utils/matchers/ItemMatcher.java | 2 +- .../com/readrops/readropslibrary/localfeed/rss/RSSItem.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java index 6c583aa6..c1a02ee0 100644 --- a/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java +++ b/app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java @@ -25,7 +25,7 @@ public final class ItemMatcher { newItem.setAuthor(item.getCreator()); newItem.setContent(item.getContent()); // Jsoup.clean(item.getContent(), Whitelist.relaxed()) newItem.setDescription(item.getDescription()); - newItem.setGuid(item.getGuid()); + newItem.setGuid(item.getGuid() != null ? item.getGuid() : item.getLink()); newItem.setTitle(Utils.cleanText(item.getTitle())); try { diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java index 46b28efa..22cd9960 100644 --- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java +++ b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java @@ -51,7 +51,7 @@ public class RSSItem { @Namespace(prefix = "content") private String content; - @Element + @Element(required = false) private String guid; public String getTitle() {