From 81de8985c8e8ba0b9cafe86d8b03972ff52d60fa Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Tue, 27 Oct 2020 21:29:19 +0100 Subject: [PATCH] Sync Nextcloud News items star state --- .../com/readrops/app/repositories/FreshRSSRepository.java | 2 +- .../com/readrops/app/repositories/NextNewsRepository.java | 2 +- db/src/main/java/com/readrops/db/dao/ItemDao.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java index 41c39236..053ab00a 100644 --- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java @@ -220,7 +220,7 @@ public class FreshRSSRepository extends ARepository { int feedId = database.feedDao().getFeedIdByRemoteId(item.getFeedRemoteId(), account.getId()); if (!initialSync && feedId > 0 && database.itemDao().remoteItemExists(item.getRemoteId(), feedId)) { - database.itemDao().setReadState(item.getRemoteId(), item.isRead()); + database.itemDao().setReadAndStarState(item.getRemoteId(), item.isRead(), item.isStarred()); continue; } 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 96789171..302e8eb1 100644 --- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java @@ -301,7 +301,7 @@ public class NextNewsRepository extends ARepository { //if the item already exists, update only its read state if (!initialSync && feedId > 0 && database.itemDao().remoteItemExists(String.valueOf(item.getRemoteId()), feedId)) { - database.itemDao().setReadState(item.getRemoteId(), item.isRead()); + database.itemDao().setReadAndStarState(item.getRemoteId(), item.isRead(), item.isStarred()); continue; } diff --git a/db/src/main/java/com/readrops/db/dao/ItemDao.java b/db/src/main/java/com/readrops/db/dao/ItemDao.java index b3cfe561..0a451e1e 100644 --- a/db/src/main/java/com/readrops/db/dao/ItemDao.java +++ b/db/src/main/java/com/readrops/db/dao/ItemDao.java @@ -89,8 +89,8 @@ public interface ItemDao extends BaseDao { @Query("Update Item set starred_changed = 0 Where feed_id in (Select id From Feed Where account_id = :accountId)") void resetStarChanges(int accountId); - @Query("Update Item set read = :read Where remoteId = :remoteId") - void setReadState(String remoteId, boolean read); + @Query("Update Item set read = :read, starred = :starred Where remoteId = :remoteId") + void setReadAndStarState(String remoteId, boolean read, boolean starred); @Query("Update Item set starred = :starred, starred_changed = :starredChanged Where id = :itemId") Completable setStarState(int itemId, boolean starred, boolean starredChanged);