From a858171be2aa041c5ada9de217a2814a18a169a9 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 11 Jan 2022 09:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BFtts?= =?UTF-8?q?=E6=9C=97=E8=AF=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/utils/NetworkUtils.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 f2b9228a5..ed86fd290 100644 --- a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt +++ b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt @@ -156,8 +156,8 @@ object NetworkUtils { * http://www.content.example.com => http://example.com */ fun getSubDomain(url: String): String { + val baseUrl = getBaseUrl(url) ?: return "" return kotlin.runCatching { - val baseUrl = getBaseUrl(url) ?: return "" val mURL = URL(baseUrl) val schema: String = mURL.protocol val host: String = mURL.host @@ -166,7 +166,11 @@ object NetworkUtils { //PublicSuffixDatabase处理域名 val domain = PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) if (domain == null) baseUrl else "${schema}://${domain}" - }.getOrDefault(url) + }.getOrDefault( + if (baseUrl.indexOf(".") == baseUrl.lastIndexOf(".")) { + baseUrl.substring(baseUrl.lastIndexOf("/") + 1) + } else baseUrl.substring(baseUrl.indexOf(".") + 1) + ) } /**