Skip to content

Commit 0523769

Browse files
committed
修复:图片加载失败兜底、Meta Logo 自然尺寸、译文跳过智能识别
1 parent 38d1873 commit 0523769

1 file changed

Lines changed: 29 additions & 8 deletions

File tree

‎app/src/main/java/com/otscup/otsmail/ui/DetailScreen.kt‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,21 @@ private object InlineImages {
243243
if (path.endsWith(".ico") || path.contains("favicon")) return false
244244
// WebView 一般不会给子资源带 Accept,按扩展名兜底
245245
if (request.requestHeaders?.get("Accept")?.contains("image/", ignoreCase = true) == true) return true
246-
return path.endsWith(".png") || path.endsWith(".jpg") || path.endsWith(".jpeg") ||
246+
if (path.endsWith(".png") || path.endsWith(".jpg") || path.endsWith(".jpeg") ||
247247
path.endsWith(".gif") || path.endsWith(".webp") || path.endsWith(".bmp") ||
248248
path.endsWith(".svg") || path.endsWith(".avif")
249+
) return true
250+
// 无扩展名的图片 CDN URL:path 含 image/img/photo/pic/media/avatar/thumbnail/cover
251+
// 或 query 参数带 w=、width=、size=、dim= 这类尺寸信号
252+
val urlLower = url.lowercase()
253+
if (path.contains("image") || path.contains("img") || path.contains("photo") ||
254+
path.contains("pic") || path.contains("media") || path.contains("avatar") ||
255+
path.contains("thumbnail") || path.contains("cover") || path.contains("cdn-cgi/imagedelivery")
256+
) return true
257+
if (urlLower.contains("?w=") || urlLower.contains("&w=") || urlLower.contains("?width=") ||
258+
urlLower.contains("&width=") || urlLower.contains("?size=") || urlLower.contains("&size=")
259+
) return true
260+
return false
249261
}
250262

251263
/**
@@ -257,7 +269,9 @@ private object InlineImages {
257269
fun isImageRequest(request: WebResourceRequest): Boolean {
258270
if (looksLikeImage(request)) return true
259271
if (request.isForMainFrame) return false
260-
return request.url?.path.orEmpty().lowercase().endsWith("/api/proxy/image")
272+
val path = request.url?.path.orEmpty().lowercase()
273+
return path.endsWith("/api/proxy/image") ||
274+
path.contains("/img/") || path.contains("/image/") || path.contains("/photo/")
261275
}
262276

263277
fun load(url: String, webViewUa: String): Pair<String, ByteArray>? {
@@ -1061,9 +1075,11 @@ fun DetailScreen(
10611075
// sanitize 对长 HTML 是纯 CPU 工作:按内容 remember,避免每次重组(滚动/展开)重跑一遍。
10621076
val baseHtml = remember(m.content, translated, showingOriginal) {
10631077
// 相对地址按服务端 origin 补全:WebView 不再继承服务端 origin(见 BODY_BASE_URL)
1078+
val isTranslated = translated.isNotEmpty() && !showingOriginal
10641079
sanitizeEmailHtml(
1065-
if (translated.isNotEmpty() && !showingOriginal) translated else m.content,
1080+
if (isTranslated) translated else m.content,
10661081
serverOrigin(),
1082+
enhanceSmartLinks = !isTranslated,
10671083
)
10681084
}
10691085
// 取不到的图片换成占位卡片;这一步只依赖失败集合,单独缓存
@@ -1996,7 +2012,7 @@ private fun hex(color: Color): String = String.format("#%06X", 0xFFFFFF and colo
19962012
* 正文用中性 origin 渲染,不补的话相对图片与相对链接都会指向一个不存在的主机
19972013
* 说明:用正则做白名单式清洗,对"邮件正文"这种非对抗性场景足够;不追求完整的 HTML 解析。
19982014
*/
1999-
internal fun sanitizeEmailHtml(raw: String, baseUrl: String = ""): String {
2015+
internal fun sanitizeEmailHtml(raw: String, baseUrl: String = "", enhanceSmartLinks: Boolean = true): String {
20002016
if (raw.isBlank()) return raw
20012017
val cleaned = raw
20022018
.replace(Regex("(?is)<(script|iframe|object|embed|form|base|link|meta)\\b[^>]*>.*?</\\1\\s*>"), "")
@@ -2007,18 +2023,21 @@ internal fun sanitizeEmailHtml(raw: String, baseUrl: String = ""): String {
20072023
val normalized = normalizeFixedWidths(markNaturalSizeImages(cleaned))
20082024
val safe = neutralizeTrackingPixels(normalized)
20092025
val safeUrls = if (baseUrl.isBlank()) safe else absolutizeHtmlUrls(safe, baseUrl)
2010-
return enhanceEmailContent(safeUrls)
2026+
// 译文通常是纯文本或不完整 HTML,不做智能识别,避免把半残内容结构搞坏
2027+
return if (enhanceSmartLinks) enhanceEmailContent(safeUrls) else safeUrls
20112028
}
20122029

20132030
private val IMG_STYLE_WIDTH = Regex("(?i)(?:^|[;\"'\\s])width\\s*:\\s*(\\d+)\\.?\\d*px")
20142031

20152032
/** 大声明尺寸的 Logo/照片按图片原始像素显示,仍受 max-width:100% 限制,不再被放满整栏。 */
2033+
private const val IMG_NATURAL_SIZE_MIN = 48
2034+
20162035
private fun markNaturalSizeImages(html: String): String = IMG_TAG.replace(html) { match ->
20172036
val tag = match.value
20182037
val attr = IMG_WIDTH_ATTR.find(tag)?.groupValues?.getOrNull(1)?.toIntOrNull()
20192038
val style = IMG_STYLE_WIDTH.find(tag)?.groupValues?.getOrNull(1)?.toIntOrNull()
20202039
val width = attr ?: style
2021-
if (width == null || width < FIXED_WIDTH_MIN || tag.contains("data-ots-natural")) tag
2040+
if (width == null || width < IMG_NATURAL_SIZE_MIN || tag.contains("data-ots-natural")) tag
20222041
else tag.replaceFirst(">", " data-ots-natural>")
20232042
}
20242043

@@ -2129,6 +2148,7 @@ private fun smartIcon(kind: String): String {
21292148
* - `style="width:600px"` → `max-width:100%`(去掉固定宽度,交给表格自动布局)
21302149
* - `width="600"` → `width="100%"`(对单列表格等价于铺满,多列里的像素列宽本就少见)
21312150
*/
2151+
/** 布局里固定像素宽度的阈值:≥ 这个值的 CSS width 或 table 像素宽改自适应。 */
21322152
private const val FIXED_WIDTH_MIN = 360
21332153

21342154
/**
@@ -2346,8 +2366,9 @@ private fun SiteMailBody(
23462366
var showingOriginal by remember { mutableStateOf(false) }
23472367
// 正文来自全站列表,同样是外部发件人控制的 HTML:与普通详情走同一套清洗
23482368
val html = remember(m, translated, showingOriginal) {
2349-
val body = if (translated.isNotEmpty() && !showingOriginal) translated else d.content
2350-
sanitizeEmailHtml(body, serverOrigin())
2369+
val isTranslated = translated.isNotEmpty() && !showingOriginal
2370+
val body = if (isTranslated) translated else d.content
2371+
sanitizeEmailHtml(body, serverOrigin(), enhanceSmartLinks = !isTranslated)
23512372
}
23522373
val copyText = m.plain.ifBlank {
23532374
d.content.replace(Regex("(?is)<[^>]+>"), " ").replace(Regex("\\s+"), " ").trim()

0 commit comments

Comments
 (0)