public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only include active feeds when marking a folder as read.

Browse source
This commit is contained in:
Mark Anderson 2016-11-22 23:03:18 +00:00
parent a3345c65c9
commit c5da62ad8a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
View file

@ -173,9 +173,14 @@ public class FeedUtils {
if (!fs.isMuted()) {
ra = ReadingAction.markFeedRead(fs, olderThan, newerThan);
}
} else if (fs.getMultipleFeeds() != null) {
// TODO new FeedSet is it always a folder?
ra = ReadingAction.markFeedRead(fs, olderThan, newerThan);
} else if (fs.isFolder()) {
Set<String> feedIds = fs.getMultipleFeeds();
Set<String> allActiveFeedIds = dbHelper.getAllActiveFeeds();
Set<String> activeFeedIds = new HashSet<String>();
activeFeedIds.addAll(feedIds);
activeFeedIds.retainAll(allActiveFeedIds);
FeedSet filteredFs = FeedSet.folder(fs.getFolderName(), activeFeedIds);
ra = ReadingAction.markFeedRead(filteredFs, olderThan, newerThan);
} else {
ra = ReadingAction.markFeedRead(fs, olderThan, newerThan);
}