FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix item duplicates when getting last modified items

Browse Source
This commit is contained in:
Shinokuni 2019-06-06 15:15:12 +02:00
parent 73b4b8e4d3
commit 64d3f384be
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
View File

@ -95,7 +95,7 @@ public class NextNewsRepository extends ARepository {
insertFeeds(syncResult.getFeeds(), account); insertFeeds(syncResult.getFeeds(), account);
timings.addSplit("insert feeds"); timings.addSplit("insert feeds");
insertItems(syncResult.getItems(), account); insertItems(syncResult.getItems(), account, syncType == NextNewsAPI.SyncType.INITIAL_SYNC);
timings.addSplit("insert items"); timings.addSplit("insert items");
timings.dumpToLog(); timings.dumpToLog();
@ -187,17 +187,22 @@ public class NextNewsRepository extends ARepository {
database.folderDao().insert(newFolders); database.folderDao().insert(newFolders);
} }
private void insertItems(List<NextNewsItem> items, Account account) { private void insertItems(List<NextNewsItem> items, Account account, boolean initialSync) {
List<Item> newItems = new ArrayList<>(); List<Item> newItems = new ArrayList<>();
for (NextNewsItem nextNewsItem : items) { for (NextNewsItem nextNewsItem : items) {
if (!initialSync) {
if (database.itemDao().remoteItemExists(nextNewsItem.getId()))
break;
}
Feed feed = database.feedDao().getFeedByRemoteId(nextNewsItem.getFeedId(), account.getId()); Feed feed = database.feedDao().getFeedByRemoteId(nextNewsItem.getFeedId(), account.getId());
Item item = ItemMatcher.nextNewsItemToItem(nextNewsItem, feed); Item item = ItemMatcher.nextNewsItemToItem(nextNewsItem, feed);
item.setReadTime(Utils.readTimeFromString(item.getContent())); item.setReadTime(Utils.readTimeFromString(item.getContent()));
newItems.add(item); newItems.add(item);
} }
Collections.sort(newItems, Item::compareTo); Collections.sort(newItems, Item::compareTo);