Fix download ahead missing out 1 chapter (#7927)

* Fix download ahead missing out 1 chapter

* Move toLong() function

* Add check whether the next chapter is queued

(cherry picked from commit 07d1b9f3bac5df3c469601b8d08ed024b5e607ec)

# Conflicts:
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt

app/src/main/java/eu/kanade/data/DatabaseUtils.kt

@@ -1,3 +0,0 @@
-package eu.kanade.data
-
-fun Boolean.toLong() = if (this) 1L else 0L

app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt

@@ -1,11 +1,11 @@
 package eu.kanade.data.chapter
 
 import eu.kanade.data.DatabaseHandler
-import eu.kanade.data.toLong
 import eu.kanade.domain.chapter.model.Chapter
 import eu.kanade.domain.chapter.model.ChapterUpdate
 import eu.kanade.domain.chapter.repository.ChapterRepository
 import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.toLong
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
 

app/src/main/java/eu/kanade/data/manga/MangaMergeRepositoryImpl.kt

@@ -2,11 +2,11 @@ package eu.kanade.data.manga
 
 import eu.kanade.data.DatabaseHandler
 import eu.kanade.data.exh.mergedMangaReferenceMapper
-import eu.kanade.data.toLong
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.manga.model.MergeMangaSettingsUpdate
 import eu.kanade.domain.manga.repository.MangaMergeRepository
 import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.toLong
 import exh.merged.sql.models.MergedMangaReference
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority

app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt

@@ -4,12 +4,12 @@ import eu.kanade.data.AndroidDatabaseHandler
 import eu.kanade.data.DatabaseHandler
 import eu.kanade.data.listOfStringsAdapter
 import eu.kanade.data.listOfStringsAndAdapter
-import eu.kanade.data.toLong
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.manga.model.MangaUpdate
 import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.toLong
 import kotlinx.coroutines.flow.Flow
 import logcat.LogPriority
 

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt

@@ -8,7 +8,6 @@ import data.Mangas
 import eu.kanade.data.DatabaseHandler
 import eu.kanade.data.exh.mergedMangaReferenceMapper
 import eu.kanade.data.manga.mangaMapper
-import eu.kanade.data.toLong
 import eu.kanade.domain.category.interactor.GetCategories
 import eu.kanade.domain.category.model.Category
 import eu.kanade.domain.history.model.HistoryUpdate
@@ -51,6 +50,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.toLong
 import exh.source.MERGED_SOURCE_ID
 import exh.source.getMainSource
 import exh.util.nullIfBlank

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/design/MigrationBottomSheetDialog.kt

@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.MigrationBottomSheetBinding
 import eu.kanade.tachiyomi.ui.browse.migration.MigrationFlags
+import eu.kanade.tachiyomi.util.system.toInt
 import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
 import uy.kohesive.injekt.injectLazy
@@ -118,8 +119,6 @@ class MigrationBottomSheetDialog(private val activity: Activity, private val lis
             pref.set(index == 1)
         }
     }
-
-    private fun Boolean.toInt() = if (this) 1 else 0
 }
 
 interface StartMigrationListener {

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

@@ -62,6 +62,7 @@ import eu.kanade.tachiyomi.util.storage.cacheImageDir
 import eu.kanade.tachiyomi.util.system.ImageUtil
 import eu.kanade.tachiyomi.util.system.isOnline
 import eu.kanade.tachiyomi.util.system.logcat
+import eu.kanade.tachiyomi.util.system.toInt
 import exh.md.utils.FollowStatus
 import exh.md.utils.MdUtil
 import exh.metadata.metadata.base.RaisedSearchMetadata
@@ -546,15 +547,19 @@ class ReaderPresenter(
         val nextChapter = viewerChaptersRelay.value?.nextChapter?.chapter ?: return
         val chaptersNumberToDownload = preferences.autoDownloadWhileReading().get()
         if (chaptersNumberToDownload == 0 || !manga.favorite) return
-        val isNextChapterDownloaded =
+        val isNextChapterDownloadedOrQueued = downloadManager.isChapterDownloaded(
-            downloadManager.isChapterDownloaded(nextChapter.name, nextChapter.scanlator, manga.title, manga.source)
+            nextChapter.name,
-        if (isNextChapterDownloaded) {
+            nextChapter.scanlator,
-            downloadAutoNextChapters(chaptersNumberToDownload, nextChapter.id)
+            manga.title,
+            manga.source,
+        ) || downloadManager.getChapterDownloadOrNull(nextChapter) != null
+        if (isNextChapterDownloadedOrQueued) {
+            downloadAutoNextChapters(chaptersNumberToDownload, nextChapter.id, nextChapter.read)
         }
     }
 
-    private fun downloadAutoNextChapters(choice: Int, nextChapterId: Long?) {
+    private fun downloadAutoNextChapters(choice: Int, nextChapterId: Long?, isNextChapterRead: Boolean) {
-        val chaptersToDownload = getNextUnreadChaptersSorted(nextChapterId).take(choice - 1)
+        val chaptersToDownload = getNextUnreadChaptersSorted(nextChapterId).take(choice - 1 + isNextChapterRead.toInt())
         if (chaptersToDownload.isNotEmpty()) {
             downloadChapters(chaptersToDownload)
         }

app/src/main/java/eu/kanade/tachiyomi/util/system/BooleanExtensions.kt

@@ -0,0 +1,5 @@
+package eu.kanade.tachiyomi.util.system
+
+fun Boolean.toInt() = if (this) 1 else 0
+
+fun Boolean.toLong() = if (this) 1L else 0L