Respect chapter list filtering when reading (closes #2810)

2020-04-01 22:37:28 -04:00
parent 89df50da4e
commit a3b660a2c9
5 changed files with 128 additions and 87 deletions
@@ -91,8 +91,27 @@ class ReaderPresenter(
                ?: error("Requested chapter of id $chapterId not found in chapter list")

        val chaptersForReader =
-                if (preferences.skipRead()) {
-                    val list = dbChapters.filter { !it.read }.toMutableList()
+                if (preferences.skipRead() || preferences.skipFiltered()) {
+                    val list = dbChapters
+                        .filter {
+                            if (preferences.skipRead() && it.read) {
+                                return@filter false
+                            } else if (preferences.skipFiltered()) {
+                                if (
+                                    (manga.readFilter == Manga.SHOW_READ && !it.read) ||
+                                    (manga.readFilter == Manga.SHOW_UNREAD && it.read) ||
+                                    (manga.downloadedFilter == Manga.SHOW_DOWNLOADED &&
+                                        !downloadManager.isChapterDownloaded(it, manga)) ||
+                                    (manga.bookmarkedFilter == Manga.SHOW_BOOKMARKED && !it.bookmark)
+                                ) {
+                                    return@filter false
+                                }
+                            }
+
+                            true
+                        }
+                        .toMutableList()
+
                    val find = list.find { it.id == chapterId }
                    if (find == null) {
                        list.add(selectedChapter)