Make option to mark duplicate chapter as read apply when reading (#1839)

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Chapter.kt

@@ -27,6 +27,9 @@ interface Chapter : SChapter, Serializable {
     var version: Long
 }
 
+val Chapter.isRecognizedNumber: Boolean
+    get() = chapter_number >= 0f
+
 fun Chapter.toDomainChapter(): DomainChapter? {
     if (id == null || manga_id == null) return null
     return DomainChapter(

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

@@ -15,6 +15,7 @@ import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.domain.source.interactor.GetIncognitoState
 import eu.kanade.domain.track.interactor.TrackChapter
 import eu.kanade.domain.track.service.TrackPreferences
+import eu.kanade.tachiyomi.data.database.models.isRecognizedNumber
 import eu.kanade.tachiyomi.data.database.models.toDomainChapter
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.DownloadProvider
@@ -537,6 +538,21 @@ class ReaderViewModel @JvmOverloads constructor(
                 readerChapter.chapter.read = true
                 updateTrackChapterRead(readerChapter)
                 deleteChapterIfNeeded(readerChapter)
+
+                val duplicateUnreadChapters = chapterList
+                    .mapNotNull {
+                        val chapter = it.chapter
+                        if (
+                            !chapter.read &&
+                            chapter.isRecognizedNumber &&
+                            chapter.chapter_number == readerChapter.chapter.chapter_number
+                        ) {
+                            ChapterUpdate(id = chapter.id!!, read = true)
+                        } else {
+                            null
+                        }
+                    }
+                updateChapter.awaitAll(duplicateUnreadChapters)
             }
 
             updateChapter.await(

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt

@@ -137,6 +137,8 @@ class ReaderPreferences(
 
     fun showNavigationOverlayOnStart() = preferenceStore.getBoolean("reader_navigation_overlay_on_start", false)
 
+    fun markDuplicateReadChapterAsRead() = preferenceStore.getBoolean("mark_duplicate_chapter_read", false)
+
     // endregion
 
     enum class FlashColor {