YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1857 from Xwite/master

Browse Source 
Glide 默认ua添加bug
This commit is contained in:
kunfei
2022-05-08 07:06:53 +08:00
committed by GitHub
parent aa47a8cc36 deb28db043
commit 0302b0aa57
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/glide/OkHttpStreamFetcher.kt
+1 -1
View File
@@ -39,7 +39,6 @@ class OkHttpStreamFetcher(private val url: GlideUrl, private val options: Option
} }
val requestBuilder: Request.Builder = Request.Builder().url(url.toStringUrl()) val requestBuilder: Request.Builder = Request.Builder().url(url.toStringUrl())
val headerMap = HashMap<String, String>() val headerMap = HashMap<String, String>()
headerMap.putAll(url.headers)
options.get(OkHttpModelLoader.sourceOriginOption)?.let { sourceUrl -> options.get(OkHttpModelLoader.sourceOriginOption)?.let { sourceUrl ->
val source = appDb.bookSourceDao.getBookSource(sourceUrl) val source = appDb.bookSourceDao.getBookSource(sourceUrl)
?: appDb.rssSourceDao.getByKey(sourceUrl) ?: appDb.rssSourceDao.getByKey(sourceUrl)
@@ -47,6 +46,7 @@ class OkHttpStreamFetcher(private val url: GlideUrl, private val options: Option
headerMap.putAll(it) headerMap.putAll(it)
} }
} }
headerMap.putAll(url.headers)
requestBuilder.addHeaders(headerMap) requestBuilder.addHeaders(headerMap)
val request: Request = requestBuilder.build() val request: Request = requestBuilder.build()
this.callback = callback this.callback = callback
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
+2
View File
@@ -541,6 +541,8 @@ class AnalyzeUrl(
fun getGlideUrl(): GlideUrl { fun getGlideUrl(): GlideUrl {
setCookie(source?.getKey()) setCookie(source?.getKey())
val headers = LazyHeaders.Builder() val headers = LazyHeaders.Builder()
//删除glide默认ua
headers.setHeader(UA_NAME, null as String?)
headerMap.forEach { (key, value) -> headerMap.forEach { (key, value) ->
headers.addHeader(key, value) headers.addHeader(key, value)
} }