BookSource.kt: Modify redundant procedure

Signed-off-by: 1552980358 <1552980358@qq.com>
4 years ago · 56fac70705
parent 7005ad9291
commit 56fac70705
1 changed files with 9 additions and 8 deletions
--- a/app/src/main/java/io/legado/app/data/entities/BookSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
@ -54,14 +54,15 @@ data class BookSource(
    fun getHeaderMap() = (HashMap<String, String>().apply {
        this[AppConst.UA_NAME] = App.INSTANCE.getPrefString("user_agent") ?: userAgent
        header?.let {
-            val header1 = when {
+            GSON.fromJsonObject<Map<String, String>>(
+                when {
                    it.startsWith("@js:", true) ->
                        evalJS(it.substring(4)).toString()
                    it.startsWith("<js>", true) ->
                        evalJS(it.substring(4, it.lastIndexOf("<"))).toString()
                    else -> it
                }
-            GSON.fromJsonObject<Map<String, String>>(header1)?.let { map ->
+            )?.let { map ->
                putAll(map)
            }
        }