From f1bf49982f24b0ee36baf642ed2d6c1672e5e7bd Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Wed, 15 Mar 2023 21:51:17 +0800 Subject: [PATCH] =?UTF-8?q?UrlUtil.getFileName=E5=85=88=E5=B0=9D=E8=AF=95?= =?UTF-8?q?=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/utils/UrlUtil.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/utils/UrlUtil.kt b/app/src/main/java/io/legado/app/utils/UrlUtil.kt index 67bcba26e..30a676f3b 100644 --- a/app/src/main/java/io/legado/app/utils/UrlUtil.kt +++ b/app/src/main/java/io/legado/app/utils/UrlUtil.kt @@ -77,14 +77,14 @@ object UrlUtil { // 其余情况 返回响应头 val headers = conn.getHeaderFields() val headersString = buildString { - headers.forEach( key, value -> + headers.forEach { key, value -> value.forEach { append(key) append(": ") append(it) append("\n") } - ) + } } AppLog.putDebug("Cannot obtain URL file name:\n$headersString") } @@ -93,12 +93,12 @@ object UrlUtil { } /* 获取合法的文件后缀 */ - fun getSuffix(url: String, default: String): String { + fun getSuffix(url: String, default: String? = null): String { val suffix = url.substringAfterLast(".").substringBeforeLast(",") //检查截取的后缀字符是否合法 [a-zA-Z0-9] val fileSuffixRegex = Regex("^[a-z\\d]+$", RegexOption.IGNORE_CASE) return if (suffix.length > 5 || !suffix.matches(fileSuffixRegex)) { - default + default ?: throw IllegalArgumentException("Cannot find illegal suffix") } else { suffix }