diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 1998feabf..1d9508285 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -14,6 +14,7 @@ **2022/01/11** * 紧急修复在线tts朗读bug +* 紧急修复登录问题 **2022/01/10** diff --git a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt index acdd3638d..cee94904d 100644 --- a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt +++ b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt @@ -155,20 +155,15 @@ object NetworkUtils { * http://www.content.example.com => example.com */ fun getSubDomain(url: String): String { - val baseUrl = getBaseUrl(url) ?: return "" + val baseUrl = getBaseUrl(url) ?: return url return kotlin.runCatching { val mURL = URL(baseUrl) - val schema: String = mURL.protocol val host: String = mURL.host //判断是否为ip if (isIPAddress(host)) return baseUrl //PublicSuffixDatabase处理域名 PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: baseUrl - }.getOrDefault( - if (baseUrl.indexOf(".") == baseUrl.lastIndexOf(".")) { - baseUrl.substring(baseUrl.lastIndexOf("/") + 1) - } else baseUrl.substring(baseUrl.indexOf(".") + 1) - ) + }.getOrDefault(url) } /**