From 09c9209a26731b6b35c34742f7b5a6287a9d128a Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Fri, 21 Nov 2025 10:53:14 +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/data/entities/HttpTTS.kt    | 3 ++-
 .../io/legado/app/help/glide/progress/OnProgressListener.kt | 2 +-
 .../io/legado/app/help/glide/progress/ProgressManager.kt    | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt b/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt
index 040bb6b3d..a79af166a 100644
--- a/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt
+++ b/app/src/main/java/io/legado/app/data/entities/HttpTTS.kt
@@ -55,7 +55,8 @@ data class HttpTTS(
                     loginUrl = doc.readString("$.loginUrl"),
                     loginUi = if (loginUi is List<*>) GSON.toJson(loginUi) else loginUi?.toString(),
                     header = doc.readString("$.header"),
-                    loginCheckJs = doc.readString("$.loginCheckJs")
+                    loginCheckJs = doc.readString("$.loginCheckJs"),
+                    lastUpdateTime = doc.readLong("$.lastUpdateTime") ?: System.currentTimeMillis()
                 )
             }
         }
diff --git a/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt b/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt
index 19561c75b..f2dcd61a6 100644
--- a/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt
+++ b/app/src/main/java/io/legado/app/help/glide/progress/OnProgressListener.kt
@@ -1,3 +1,3 @@
 package io.legado.app.help.glide.progress
 
-typealias OnProgressListener = ((isComplete: Boolean, percentage: Int, bytesRead: Long, totalBytes: Long) -> Unit)?
\ No newline at end of file
+typealias OnProgressListener = (isComplete: Boolean, percentage: Int, bytesRead: Long, totalBytes: Long) -> Unit
diff --git a/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt b/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt
index 8b37534fa..5011b0d2d 100644
--- a/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt
+++ b/app/src/main/java/io/legado/app/help/glide/progress/ProgressManager.kt
@@ -28,7 +28,7 @@ object ProgressManager {
     }
 
     fun addListener(url: String, listener: OnProgressListener) {
-        if (url.isNotEmpty() && listener != null) {
+        if (url.isNotEmpty()) {
             val url = getUrlNoOption(url)
             listenersMap[url] = listener
             listener.invoke(false, 1, 0, 0)
@@ -42,7 +42,7 @@ object ProgressManager {
         }
     }
 
-    fun getProgressListener(url: String): OnProgressListener {
+    fun getProgressListener(url: String): OnProgressListener? {
         return if (url.isEmpty() || listenersMap.isEmpty()) {
             null
         } else {
@@ -53,7 +53,7 @@ object ProgressManager {
     private fun getUrlNoOption(url: String): String {
         val urlMatcher = AnalyzeUrl.paramPattern.matcher(url)
         return if (urlMatcher.find()) {
-            url.substring(0, urlMatcher.start())
+            url.take(urlMatcher.start())
         } else {
             url
         }