From 49cafbb0628203d944095945890a48b206034b38 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Fri, 18 Oct 2019 22:07:24 +0200 Subject: [PATCH] Set modified items read state for Nextcloud news sync --- .../app/repositories/NextNewsRepository.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java index 7027b9da..4e89a581 100644 --- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java @@ -300,9 +300,9 @@ public class NextNewsRepository extends ARepository { for (NextNewsItem nextNewsItem : items) { int feedId = database.feedDao().getFeedIdByRemoteId(String.valueOf(nextNewsItem.getFeedId()), account.getId()); - if (!initialSync && feedId > 0) { - if (database.itemDao().remoteItemExists(String.valueOf(nextNewsItem.getId()), feedId)) - break; + if (!initialSync && feedId > 0 && database.itemDao().remoteItemExists(String.valueOf(nextNewsItem.getId()), feedId)) { + database.itemDao().setReadState(String.valueOf(nextNewsItem.getId()), !nextNewsItem.isUnread()); + break; } Item item = ItemMatcher.nextNewsItemToItem(nextNewsItem, feedId); @@ -311,7 +311,9 @@ public class NextNewsRepository extends ARepository { newItems.add(item); } - Collections.sort(newItems, Item::compareTo); - database.itemDao().insert(newItems); + if (!newItems.isEmpty()) { + Collections.sort(newItems, Item::compareTo); + database.itemDao().insert(newItems); + } } }