From 2220b6a91dbb28af8b9793c1a94a63765b695c04 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 17 Apr 2021 11:38:08 -0400 Subject: [PATCH] Follow chapter sort setting for start/resume FAB (closes #1716) (cherry picked from commit f7cc36f2f00ff8bcc690a0e5e94b1464f014e3b6) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt --- .../main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt index bbdc7554c..7d53555a8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt @@ -892,10 +892,9 @@ class MangaPresenter( */ fun getNextUnreadChapter(): ChapterItem? { return if (source.isEhBasedSource()) { - val chapter = chapters.sortedBy { it.source_order }.getOrNull(0) - if (chapter?.read == false) chapter else null + chapters.sortedWith(getChapterSort()).lastOrNull()?.takeUnless { it.read } } else { - chapters.sortedByDescending { it.source_order }.find { !it.read } + chapters.sortedWith(getChapterSort()).findLast { !it.read } } }