Skip to content

Commit 0bffbb6

Browse files
committed
优化
1 parent 1ac5dfd commit 0bffbb6

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.legado.app.help.http
22

3+
import io.legado.app.constant.AppLog
34
import io.legado.app.data.appDb
45
import io.legado.app.help.CacheManager
56
import io.legado.app.utils.NetworkUtils
@@ -49,15 +50,24 @@ object CookieManager {
4950
* 加载Cookies到请求中
5051
*/
5152
fun loadRequest(request: Request): Request {
52-
val domain = NetworkUtils.getSubDomain(request.url.toString())
53+
val url = request.url.toString()
54+
val domain = NetworkUtils.getSubDomain(url)
5355

5456
val cookie = CookieStore.getCookie(domain)
5557
val requestCookie = request.header("Cookie")
5658

57-
mergeCookies(cookie, requestCookie)?.let {
58-
return request.newBuilder()
59-
.header("Cookie", it)
60-
.build()
59+
mergeCookies(cookie, requestCookie)?.let { cookie ->
60+
kotlin.runCatching {
61+
return request.newBuilder()
62+
.header("Cookie", cookie)
63+
.build()
64+
}.onFailure {
65+
CookieStore.removeCookie(url)
66+
AppLog.put(
67+
"设置cookie出错,已清除cookie $domain cookie:$cookie\n${it.localizedMessage}",
68+
it
69+
)
70+
}
6171
}
6272
return request
6373
}

0 commit comments

Comments
 (0)