From 05a88dd6de1215f2e3472df5d53472575ea5665d Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 9 Jul 2023 09:54:05 -0400 Subject: [PATCH] Handle chapter read status in correct order Fixes #9687 (cherry picked from commit 1e3d9a00f2366919430a8077ad79808c8514d793) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt --- .../tachiyomi/ui/reader/ReaderViewModel.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 49491ee88..855401d34 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -617,15 +617,6 @@ class ReaderViewModel( readerChapter.requestedPage = pageIndex readerChapter.chapter.last_page_read = pageIndex - updateChapter.await( - ChapterUpdate( - id = readerChapter.chapter.id!!, - read = readerChapter.chapter.read, - bookmark = readerChapter.chapter.bookmark, - lastPageRead = readerChapter.chapter.last_page_read.toLong(), - ), - ) - if (readerChapter.pages?.lastIndex == pageIndex) { readerChapter.chapter.read = true // SY --> @@ -646,6 +637,15 @@ class ReaderViewModel( updateTrackChapterRead(readerChapter) deleteChapterIfNeeded(readerChapter) } + + updateChapter.await( + ChapterUpdate( + id = readerChapter.chapter.id!!, + read = readerChapter.chapter.read, + bookmark = readerChapter.chapter.bookmark, + lastPageRead = readerChapter.chapter.last_page_read.toLong(), + ), + ) } }