From b20a85992ba2b5ce1d031fa4f6ec1d099c77f999 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 23 May 2013 07:12:17 +0200
Subject: [PATCH] return null if disabledUntil is in the past

---
 .../java/com/commafeed/frontend/model/Subscription.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/frontend/model/Subscription.java b/src/main/java/com/commafeed/frontend/model/Subscription.java
index b357d00d..409647fd 100644
--- a/src/main/java/com/commafeed/frontend/model/Subscription.java
+++ b/src/main/java/com/commafeed/frontend/model/Subscription.java
@@ -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()));