From 877d96a50aaf255d9acc19cef04eed6ab044719a Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 22 Nov 2022 16:19:20 +0800 Subject: [PATCH] Release 1.8.3.2 --- app/build.gradle | 4 ++-- .../main/java/com/hippo/ehviewer/client/EhDns.kt | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a25a3c931..e43345916 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "moe.tarsin.ehviewer" minSdkVersion 28 targetSdkVersion 33 - versionCode 180022 - versionName "1.8.3.1" + versionCode 180023 + versionName "1.8.3.2" resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th' } diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhDns.kt b/app/src/main/java/com/hippo/ehviewer/client/EhDns.kt index 779287088..057a269bf 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhDns.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhDns.kt @@ -114,20 +114,14 @@ class EhDns(context: Context) : Dns { host: String, vararg ips: Pair ) { - map[host] = ips.mapNotNull { - if (Settings.getDF() && it.second) null else Hosts.toInetAddress(host, it.first) + map[host] = ips.mapNotNull { pair -> + Hosts.toInetAddress(host, pair.first).takeUnless { Settings.getDF() && pair.second } } } @Throws(UnknownHostException::class) override fun lookup(hostname: String): List { - var inetAddresses = hosts[hostname] - inetAddresses ?: run { - if (Settings.getBuiltInHosts()) { - inetAddresses = builtInHosts[hostname] - } - } - inetAddresses ?: return Dns.SYSTEM.lookup(hostname) - return inetAddresses!! // Should never be null here + return hosts[hostname] ?: builtInHosts[hostname].takeIf { Settings.getBuiltInHosts() } + ?: Dns.SYSTEM.lookup(hostname) } } \ No newline at end of file