From 1b48d661e8f4e52e16214bf9a8ba3299ccca0073 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 13 Apr 2017 14:43:43 +0100 Subject: [PATCH 1/2] Use original timestamp for RSS posts, if available. --- .../java/org/briarproject/briar/feed/FeedManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java index bb97bb0d4..735e220c6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java @@ -467,7 +467,11 @@ class FeedManagerImpl implements FeedManager, Client, EventListener, // get other information for post GroupId groupId = feed.getBlogId(); - long time = clock.currentTimeMillis(); + long time; + Date date = entry.getUpdatedDate(); + if (date == null) date = entry.getPublishedDate(); + if (date == null) time = clock.currentTimeMillis(); + else time = date.getTime(); String body = getPostBody(b.toString()); try { // create and store post From 115d488bc3b2442f52c6341a7081131e2619f2b7 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 13 Apr 2017 16:21:00 +0100 Subject: [PATCH 2/2] Clamp the imported timestamp within reasonable limits. --- .../java/org/briarproject/briar/feed/FeedManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java index 735e220c6..609166ad5 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java @@ -467,11 +467,11 @@ class FeedManagerImpl implements FeedManager, Client, EventListener, // get other information for post GroupId groupId = feed.getBlogId(); - long time; + long time, now = clock.currentTimeMillis(); Date date = entry.getUpdatedDate(); if (date == null) date = entry.getPublishedDate(); - if (date == null) time = clock.currentTimeMillis(); - else time = date.getTime(); + if (date == null) time = now; + else time = Math.max(0, Math.min(date.getTime(), now)); String body = getPostBody(b.toString()); try { // create and store post