优化自定义cookie设置

e2ba018061

app/src/main/java/io/legado/app/help/http/CookieStore.kt

@@ -63,7 +63,7 @@ object CookieStore : CookiePersistor {
         return cookieMap
     }
 
-    private fun mapToCookie(cookieMap: Map<String, String>?): String? {
+    fun mapToCookie(cookieMap: Map<String, String>?): String? {
         if (cookieMap == null || cookieMap.isEmpty()) {
             return null
         }

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -281,7 +281,13 @@ class AnalyzeUrl(
     fun getResponse(tag: String): Call<String> {
         val cookie = CookieStore.getCookie(tag)
         if (cookie.isNotEmpty()) {
-            headerMap["Cookie"] += ";${cookie}"
+            val cookieMap = CookieStore.cookieToMap(cookie)
+            val customCookieMap = CookieStore.cookieToMap(headerMap.get("Cookie") ?: "")
+            cookieMap.putAll(customCookieMap)
+            val newCookie = CookieStore.mapToCookie(cookieMap)
+            newCookie?.let {
+                headerMap.put("Cookie", it)
+            }
         }
         return when {
             method == RequestMethod.POST -> {
@@ -312,6 +318,16 @@ class AnalyzeUrl(
         if (type != null) {
             return Res(url, StringUtils.byteToHexString(getResponseBytes(tag)))
         }
+        val cookie = CookieStore.getCookie(tag)
+        if (cookie.isNotEmpty()) {
+            val cookieMap = CookieStore.cookieToMap(cookie)
+            val customCookieMap = CookieStore.cookieToMap(headerMap.get("Cookie") ?: "")
+            cookieMap.putAll(customCookieMap)
+            val newCookie = CookieStore.mapToCookie(cookieMap)
+            newCookie?.let {
+                headerMap.put("Cookie", it)
+            }
+        }
         if (useWebView) {
             val params = AjaxWebView.AjaxParams(url)
             params.headerMap = headerMap
@@ -322,10 +338,6 @@ class AnalyzeUrl(
             params.tag = tag
             return HttpHelper.ajax(params)
         }
-        val cookie = CookieStore.getCookie(tag)
-        if (cookie.isNotEmpty()) {
-            headerMap["Cookie"] += ";${cookie}"
-        }
         val res = when {
             method == RequestMethod.POST -> {
                 if (fieldMap.isNotEmpty()) {
@@ -356,7 +368,13 @@ class AnalyzeUrl(
         if (tag != null) {
             val cookie = CookieStore.getCookie(tag)
             if (cookie.isNotEmpty()) {
-                headerMap["Cookie"] += ";${cookie}"
+                val cookieMap = CookieStore.cookieToMap(cookie)
+                val customCookieMap = CookieStore.cookieToMap(headerMap.get("Cookie") ?: "")
+                cookieMap.putAll(customCookieMap)
+                val newCookie = CookieStore.mapToCookie(cookieMap)
+                newCookie?.let {
+                    headerMap.put("Cookie", it)
+                }
             }
         }
         val response = when {