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

don't display entries twice when refreshing during loading (fix #473)

Browse Source
This commit is contained in:
Athou
2013-08-01 11:17:38 +02:00
parent 10fdffc378
commit 8df587aaad
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -106,6 +106,8 @@ public class CategoryREST extends AbstractResourceREST {
limit = Math.max(0, limit);
Entries entries = new Entries();
entries.setOffset(offset);
entries.setLimit(limit);
boolean unreadOnly = readType == ReadType.unread;
if (StringUtils.isBlank(id)) {
id = ALL;

4
src/main/java/com/commafeed/frontend/rest/resources/EntryREST.java
View File

@@ -98,7 +98,9 @@ public class EntryREST extends AbstractResourceREST {
Preconditions.checkArgument(StringUtils.length(keywords) >= 3);
Entries entries = new Entries();
entries.setOffset(offset);
entries.setLimit(limit);
List<FeedSubscription> subs = feedSubscriptionDAO.findAll(getUser());
List<FeedEntryStatus> entriesStatus = feedEntryStatusDAO.findBySubscriptions(subs, false, keywords, null, offset, limit + 1,
ReadingOrder.desc, true);

3
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -145,6 +145,9 @@ public class FeedREST extends AbstractResourceREST {
limit = Math.max(0, limit);
Entries entries = new Entries();
entries.setOffset(offset);
entries.setLimit(limit);
boolean unreadOnly = readType == ReadType.unread;
Date newerThanDate = newerThan == null ? null : new Date(Long.valueOf(newerThan));