From afa9ac2e9767f91e965ac9ab03e0ce7ccd080271 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:57:20 +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

---
 .../io/legado/app/data/entities/BaseSource.kt | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt
index d9453a8f5..93cb5723e 100644
--- a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt
@@ -13,7 +13,11 @@ import io.legado.app.help.SymmetricCryptoAndroid
 import io.legado.app.help.config.AppConfig
 import io.legado.app.help.http.CookieStore
 import io.legado.app.model.SharedJsScope
-import io.legado.app.utils.*
+import io.legado.app.utils.GSON
+import io.legado.app.utils.fromJsonArray
+import io.legado.app.utils.fromJsonObject
+import io.legado.app.utils.has
+import io.legado.app.utils.printOnDebug
 import org.intellij.lang.annotations.Language
 import org.mozilla.javascript.Scriptable
 
@@ -99,19 +103,13 @@ interface BaseSource : JsExtensions {
      */
     fun getHeaderMap(hasLoginHeader: Boolean = false) = HashMap<String, String>().apply {
         header?.let {
-            val savedHeader = it
-            header = null
-            val json = try {
-                when {
-                    it.startsWith("@js:", true) -> evalJS(it.substring(4)).toString()
-                    it.startsWith("<js>", true) -> evalJS(
-                        it.substring(4, it.lastIndexOf("<"))
-                    ).toString()
+            val json = when {
+                it.startsWith("@js:", true) -> evalJS(it.substring(4)).toString()
+                it.startsWith("<js>", true) -> evalJS(
+                    it.substring(4, it.lastIndexOf("<"))
+                ).toString()
 
-                    else -> it
-                }
-            } finally {
-                header = savedHeader
+                else -> it
             }
             GSON.fromJsonObject<Map<String, String>>(json).getOrNull()?.let { map ->
                 putAll(map)