From 4fd13433ed2ef7d9b96fd2754b6b3b2dc09b787f Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 11 Jan 2022 14:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/utils/NetworkUtils.kt | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 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 477a2e11f..978844a8d 100644 --- a/app/src/main/java/io/legado/app/utils/NetworkUtils.kt +++ b/app/src/main/java/io/legado/app/utils/NetworkUtils.kt @@ -141,10 +141,15 @@ object NetworkUtils { fun getBaseUrl(url: String?): String? { url ?: return null - val index = url.indexOf("/", 9) - return if (index == -1) { - url - } else url.substring(0, index) + if (url.startsWith("http://", true) + || url.startsWith("https://", true) + ) { + val index = url.indexOf("/", 9) + return if (index == -1) { + url + } else url.substring(0, index) + } + return null } /** @@ -156,20 +161,14 @@ object NetworkUtils { */ fun getSubDomain(url: String): String { val baseUrl = getBaseUrl(url) ?: return url - return if (url.startsWith("http://", true) - || url.startsWith("https://", true) - ) { - kotlin.runCatching { - val mURL = URL(baseUrl) - val host: String = mURL.host - //判断是否为ip - if (isIPAddress(host)) return baseUrl - //PublicSuffixDatabase处理域名 - PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: baseUrl - }.getOrDefault(baseUrl) - } else { - baseUrl - } + return kotlin.runCatching { + val mURL = URL(baseUrl) + val host: String = mURL.host + //判断是否为ip + if (isIPAddress(host)) return baseUrl + //PublicSuffixDatabase处理域名 + PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: baseUrl + }.getOrDefault(baseUrl) } /**