FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix starred items duplication

This commit is contained in:
Shinokuni 2021-07-02 17:50:40 +02:00
parent ea14ae3013
commit 2c5672b3d5
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
View File

@ -127,10 +127,10 @@ public class FreshRSSRepository extends ARepository {
insertFeeds(syncResult.getFeeds());
logger.addSplit("feeds insertion");
insertItems(syncResult.getItems());
insertItems(syncResult.getItems(), false);
logger.addSplit("items insertion");
insertItems(syncResult.getStarredItems());
insertItems(syncResult.getStarredItems(), true);
logger.addSplit("starred items insertion");
insertItemsIds(syncResult.getUnreadIds(), syncResult.getStarredIds());
@ -233,7 +233,7 @@ public class FreshRSSRepository extends ARepository {
database.folderDao().foldersUpsert(freshRSSFolders, account);
}
private void insertItems(List<Item> items) {
private void insertItems(List<Item> items, boolean starredItems) {
List<Item> itemsToInsert = new ArrayList<>();
Map<String, Integer> itemsFeedsIds = new HashMap<>();
@ -248,7 +248,16 @@ public class FreshRSSRepository extends ARepository {
item.setFeedId(feedId);
item.setReadTime(Utils.readTimeFromString(item.getContent()));
itemsToInsert.add(item);
// workaround to avoid inserting starred items coming from the main item call
// as the API exclusion filter doesn't seem to work
if (!starredItems) {
if (!item.isStarred()) {
itemsToInsert.add(item);
}
} else {
itemsToInsert.add(item);
}
}
if (!itemsToInsert.isEmpty()) {
@ -262,7 +271,9 @@ public class FreshRSSRepository extends ARepository {
database.itemStateDao().insertItemStates(unreadIds.stream().map(id -> {
boolean starred = starredIds.stream().filter(starredId -> starredId.equals(id)).count() == 1;
starredIds.remove(id);
if (starred) {
starredIds.remove(id);
}
return new ItemState(0, false, starred, id, account.getId());
}