android/ReadYou
1
0
Fork 0
mirror of https://github.com/Ashinch/ReadYou.git synced 2026-03-13 09:53:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: prefer HTTP header charset and fallback to UTF-8 when missing (#1196)

Browse Source 
* fix: feed character decoding issue

* fix: prefer HTTP header charset, fallback to UTF-8 for missing charset
This commit is contained in:
ACE
2025-11-27 07:16:13 +05:30
committed by GitHub
parent 2841892329
commit 2afcc20fc2
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/me/ash/reader/infrastructure/rss/RssHelper.kt
View File

@@ -50,8 +50,15 @@ constructor(
return withContext(ioDispatcher) {
val response = response(okHttpClient, feedLink)
val contentType = response.header("Content-Type")
val httpContentType =
contentType?.let {
if (it.contains("charset=", ignoreCase = true)) it
else "$it; charset=UTF-8"
} ?: "text/xml; charset=UTF-8"
response.body.byteStream().use { inputStream ->
SyndFeedInput().build(XmlReader(inputStream, contentType)).also {
SyndFeedInput().build(XmlReader(inputStream, httpContentType)).also {
it.icon = SyndImageImpl()
it.icon.link = queryRssIconLink(feedLink)
it.icon.url = it.icon.link
@@ -120,10 +127,17 @@ constructor(
val accountId = context.currentAccountId
val response = response(okHttpClient, feed.url)
val contentType = response.header("Content-Type")
val httpContentType =
contentType?.let {
if (it.contains("charset=", ignoreCase = true)) it
else "$it; charset=UTF-8"
} ?: "text/xml; charset=UTF-8"
response.body.byteStream().use { inputStream ->
SyndFeedInput()
.apply { isPreserveWireFeed = true }
.build(XmlReader(inputStream, contentType))
.build(XmlReader(inputStream, httpContentType))
.entries
.asSequence()
.takeWhile { latestLink == null || latestLink != it.link }