From 483ed9455a86d51779eb157a64e630fe38353817 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Thu, 29 Feb 2024 20:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/model/CacheBook.kt          | 3 +--
 app/src/main/java/io/legado/app/service/CacheBookService.kt | 5 ++---
 .../main/java/io/legado/app/ui/book/cache/CacheActivity.kt  | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/CacheBook.kt b/app/src/main/java/io/legado/app/model/CacheBook.kt
index 3253bc49f..cdcbbf569 100644
--- a/app/src/main/java/io/legado/app/model/CacheBook.kt
+++ b/app/src/main/java/io/legado/app/model/CacheBook.kt
@@ -68,14 +68,13 @@ object CacheBook {
         }
     }
 
-    fun start(context: Context, book: Book, start: Int, end: Int, startDownload: Boolean = true) {
+    fun start(context: Context, book: Book, start: Int, end: Int) {
         if (!book.isLocal) {
             context.startService<CacheBookService> {
                 action = IntentAction.start
                 putExtra("bookUrl", book.bookUrl)
                 putExtra("start", start)
                 putExtra("end", end)
-                putExtra("startDownload", startDownload)
             }
         }
     }
diff --git a/app/src/main/java/io/legado/app/service/CacheBookService.kt b/app/src/main/java/io/legado/app/service/CacheBookService.kt
index 5599ccdec..d9b234fe5 100644
--- a/app/src/main/java/io/legado/app/service/CacheBookService.kt
+++ b/app/src/main/java/io/legado/app/service/CacheBookService.kt
@@ -80,8 +80,7 @@ class CacheBookService : BaseService() {
                 IntentAction.start -> addDownloadData(
                     intent.getStringExtra("bookUrl"),
                     intent.getIntExtra("start", 0),
-                    intent.getIntExtra("end", 0),
-                    intent.getBooleanExtra("startDownload", true)
+                    intent.getIntExtra("end", 0)
                 )
 
                 IntentAction.remove -> removeDownload(intent.getStringExtra("bookUrl"))
@@ -99,7 +98,7 @@ class CacheBookService : BaseService() {
         postEvent(EventBus.UP_DOWNLOAD, "")
     }
 
-    private fun addDownloadData(bookUrl: String?, start: Int, end: Int, startDownload: Boolean) {
+    private fun addDownloadData(bookUrl: String?, start: Int, end: Int) {
         bookUrl ?: return
         execute {
             val cacheBook = CacheBook.getOrCreate(bookUrl) ?: return@execute
diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
index f294d94c1..f58ccca72 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
@@ -158,14 +158,12 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
         when (item.itemId) {
             R.id.menu_download -> {
                 if (!CacheBook.isRun) {
-                    val lastIndex = adapter.itemCount - 1
-                    adapter.getItems().forEachIndexed { index, book ->
+                    adapter.getItems().forEach { book ->
                         CacheBook.start(
                             this@CacheActivity,
                             book,
                             book.durChapterIndex,
-                            book.lastChapterIndex,
-                            index == lastIndex
+                            book.lastChapterIndex
                         )
                     }
                 } else {