From 2e7f72eb781fdcc19d81a198640483d35d01d4bf Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Tue, 27 Aug 2024 15:09:34 +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/service/HttpReadAloudService.kt       | 19 +++----------------
 .../app/ui/book/read/ReadBookActivity.kt      |  2 +-
 .../app/ui/book/search/SearchActivity.kt      |  6 +++---
 .../app/utils/ActivityResultContracts.kt      |  2 +-
 gradle/libs.versions.toml                     |  2 +-
 5 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
index ebf240f0f..06de64bfc 100644
--- a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
@@ -17,6 +17,7 @@ import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.LoadControl.Parameters
 import androidx.media3.exoplayer.offline.DefaultDownloaderFactory
 import androidx.media3.exoplayer.offline.DownloadRequest
 import androidx.media3.exoplayer.offline.Downloader
@@ -596,22 +597,8 @@ class HttpReadAloudService : BaseReadAloudService(),
     }
 
     inner class CustomLoadControl : DefaultLoadControl() {
-        override fun shouldStartPlayback(
-            timeline: Timeline,
-            mediaPeriodId: MediaSource.MediaPeriodId,
-            bufferedDurationUs: Long,
-            playbackSpeed: Float,
-            rebuffering: Boolean,
-            targetLiveOffsetUs: Long
-        ): Boolean {
-            return super.shouldStartPlayback(
-                timeline,
-                mediaPeriodId,
-                bufferedDurationUs,
-                playbackSpeed,
-                rebuffering,
-                targetLiveOffsetUs
-            ) || bufferedPercentage == 100
+        override fun shouldStartPlayback(parameters: Parameters): Boolean {
+            return super.shouldStartPlayback(parameters) || bufferedPercentage == 100
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 5b66a354a..1b8fb8f75 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -292,7 +292,7 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         if (!ReadBook.inBookshelf) {
             viewModel.removeFromBookshelf(null)
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index fa98e7f7b..afa603cb1 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -93,9 +93,9 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         receiptIntent(intent)
     }
 
-    override fun onNewIntent(data: Intent?) {
-        super.onNewIntent(data)
-        receiptIntent(data)
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        receiptIntent(intent)
     }
 
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
index 6a8e94a00..f354dbcab 100644
--- a/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
+++ b/app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt
@@ -8,7 +8,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
 
-fun ActivityResultLauncher<*>.launch() {
+fun <T> ActivityResultLauncher<T?>.launch() {
     launch(null)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd646bc99..95f9d56ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ room = "2.6.1"
 splitties = "3.0.0"
 rhino = "1.7.15"
 
-activity = "1.8.2"
+activity = "1.9.1"
 kotlinxSerialization = "1.7.1"
 swiperefreshlayout = "1.1.0"
 viewpager2 = "1.1.0"