Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double page mark as read

Browse Source
This commit is contained in:
Jobobby04 2023-08-13 12:03:06 -04:00
parent ebb690cbe7
commit c20ea36f50
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View File

@ -1219,7 +1219,7 @@ class ReaderActivity : BaseActivity() {
} else { } else {
"${page.number}" "${page.number}"
} }
viewModel.onPageSelected(page, currentPageText) viewModel.onPageSelected(page, currentPageText, hasExtraPage)
// SY <-- // SY <--
} }

13
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
View File

@ -484,7 +484,7 @@ class ReaderViewModel(
* read, update tracking services, enqueue downloaded chapter deletion, and updating the active chapter if this * read, update tracking services, enqueue downloaded chapter deletion, and updating the active chapter if this
* [page]'s chapter is different from the currently active. * [page]'s chapter is different from the currently active.
*/ */
fun onPageSelected(page: ReaderPage, currentPageText: String) { fun onPageSelected(page: ReaderPage, currentPageText: String /* SY --> */, hasExtraPage: Boolean /* SY <-- */) {
// InsertPage and StencilPage doesn't change page progress // InsertPage and StencilPage doesn't change page progress
if (page is InsertPage || page is StencilPage) { if (page is InsertPage || page is StencilPage) {
return return
@ -499,7 +499,7 @@ class ReaderViewModel(
// Save last page read and mark as read if needed // Save last page read and mark as read if needed
viewModelScope.launchNonCancellable { viewModelScope.launchNonCancellable {
updateChapterProgress(selectedChapter, page) updateChapterProgress(selectedChapter, page/* SY --> */, hasExtraPage/* SY <-- */)
} }
if (selectedChapter != getCurrentChapter()) { if (selectedChapter != getCurrentChapter()) {
@ -581,7 +581,7 @@ class ReaderViewModel(
* Saves the chapter progress (last read page and whether it's read) * Saves the chapter progress (last read page and whether it's read)
* if incognito mode isn't on. * if incognito mode isn't on.
*/ */
private suspend fun updateChapterProgress(readerChapter: ReaderChapter, page: Page) { private suspend fun updateChapterProgress(readerChapter: ReaderChapter, page: Page/* SY --> */, hasExtraPage: Boolean/* SY <-- */) {
val pageIndex = page.index val pageIndex = page.index
mutableState.update { mutableState.update {
@ -592,7 +592,12 @@ class ReaderViewModel(
if (!incognitoMode && page.status != Page.State.ERROR) { if (!incognitoMode && page.status != Page.State.ERROR) {
readerChapter.chapter.last_page_read = pageIndex readerChapter.chapter.last_page_read = pageIndex
if (readerChapter.pages?.lastIndex == pageIndex) { // SY -->
if (
readerChapter.pages?.lastIndex == pageIndex ||
(hasExtraPage && readerChapter.pages?.lastIndex?.minus(1) == page.index)
) {
// SY <--
readerChapter.chapter.read = true readerChapter.chapter.read = true
// SY --> // SY -->
if (manga?.isEhBasedManga() == true) { if (manga?.isEhBasedManga() == true) {