From 7297a2664cb7f920b6d64f374a37d65c19b002a0 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 16 Jan 2018 23:17:00 -0800 Subject: [PATCH] Avoid problematic local DNS resolver --- core/src/overture/src/github.com/shadowsocks/overture | 2 +- .../main/java/com/github/shadowsocks/bg/LocalDnsService.kt | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/overture/src/github.com/shadowsocks/overture b/core/src/overture/src/github.com/shadowsocks/overture index 445ca900..466f9902 160000 --- a/core/src/overture/src/github.com/shadowsocks/overture +++ b/core/src/overture/src/github.com/shadowsocks/overture @@ -1 +1 @@ -Subproject commit 445ca9003efff4b853ea8ebf49d7c0854ebb31b0 +Subproject commit 466f9902c9779b8801f521f88db1d1522c880c26 diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt b/mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt index a9857d36..b67ce8b5 100644 --- a/mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt +++ b/mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt @@ -79,12 +79,6 @@ object LocalDnsService { makeDns("Primary-2", "114.114.114.114", false) )) - this as Context - try { - val localLinkDns = Dns.getDnsResolver(this) - localDns.put(makeDns("Primary-3", localLinkDns, false)) - } catch (_: Exception) { } // ignore - when (profile.route) { Acl.BYPASS_CHN, Acl.BYPASS_LAN_CHN, Acl.GFWLIST, Acl.CUSTOM_RULES -> config .put("PrimaryDNS", localDns)