Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

return null if disabledUntil is in the past

Browse Source
This commit is contained in:
Athou
2013-05-23 07:12:17 +02:00
parent 7d09dc8046
commit b20a85992b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/commafeed/frontend/model/Subscription.java
View File

@@ -1,6 +1,7 @@
package com.commafeed.frontend.model;
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
@@ -21,6 +22,7 @@ public class Subscription implements Serializable {
public static Subscription build(FeedSubscription subscription,
long unreadCount) {
Date now = Calendar.getInstance().getTime();
FeedCategory category = subscription.getCategory();
Feed feed = subscription.getFeed();
Subscription sub = new Subscription();
@@ -31,7 +33,9 @@ public class Subscription implements Serializable {
sub.setFeedUrl(feed.getUrl());
sub.setFeedLink(feed.getLink());
sub.setLastRefresh(feed.getLastUpdated());
sub.setNextRefresh(feed.getDisabledUntil());
sub.setNextRefresh((feed.getDisabledUntil() != null && feed
.getDisabledUntil().before(now)) ? now : feed
.getDisabledUntil());
sub.setUnread(unreadCount);
sub.setCategoryId(category == null ? null : String.valueOf(category
.getId()));