pull/1515/head
gedoor 3 years ago
parent e0d03f56c1
commit 540676ac90
  1. 12
      app/src/main/java/io/legado/app/utils/NetworkUtils.kt

@ -149,11 +149,10 @@ object NetworkUtils {
/** /**
* 获取二级域名供cookie保存和读取 * 获取二级域名供cookie保存和读取
* * http://1.2.3.4 => 1.2.3.4
* http://1.2.3.4 => http://1.2.3.4 * https://www.example.com => example.com
* https://www.example.com => https://example.com * http://www.biquge.com.cn => biquge.com.cn
* http://www.biquge.com.cn => http://biquge.com.cn * http://www.content.example.com => example.com
* http://www.content.example.com => http://example.com
*/ */
fun getSubDomain(url: String): String { fun getSubDomain(url: String): String {
val baseUrl = getBaseUrl(url) ?: return "" val baseUrl = getBaseUrl(url) ?: return ""
@ -164,8 +163,7 @@ object NetworkUtils {
//判断是否为ip //判断是否为ip
if (isIPAddress(host)) return baseUrl if (isIPAddress(host)) return baseUrl
//PublicSuffixDatabase处理域名 //PublicSuffixDatabase处理域名
val domain = PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) PublicSuffixDatabase.get().getEffectiveTldPlusOne(host) ?: baseUrl
if (domain == null) baseUrl else "${schema}://${domain}"
}.getOrDefault( }.getOrDefault(
if (baseUrl.indexOf(".") == baseUrl.lastIndexOf(".")) { if (baseUrl.indexOf(".") == baseUrl.lastIndexOf(".")) {
baseUrl.substring(baseUrl.lastIndexOf("/") + 1) baseUrl.substring(baseUrl.lastIndexOf("/") + 1)

Loading…
Cancel
Save