From 15262343f40cb66ded0ca8212994bedabc8a3cce Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 8 Dec 2014 10:35:59 +0800
Subject: [PATCH] restore DNS nicely

---
 .../github/shadowsocks/ShadowsocksNatService.scala    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
index 2be09d8d..25ca4535 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
@@ -138,7 +138,7 @@ class ShadowsocksNatService extends Service with BaseService {
   }
 
   def resetDns() = {
-    setDnsForAllNetwork("114.114.114.114 8.8.8.8 208.67.222.222")
+    restoreDnsForAllNetwork()
   }
 
   def flushDns() {
@@ -541,10 +541,6 @@ class ShadowsocksNatService extends Service with BaseService {
         // Clean up
         killProcesses()
 
-        // Set DNS
-        if (Utils.isLollipopOrAbove) setupDns()
-        flushDns()
-
         var resolved: Boolean = false
         if (!InetAddressUtils.isIPv4Address(config.proxy) &&
           !InetAddressUtils.isIPv6Address(config.proxy)) {
@@ -559,6 +555,11 @@ class ShadowsocksNatService extends Service with BaseService {
         }
 
         if (resolved && handleConnection) {
+
+          // Set DNS
+          if (Utils.isLollipopOrAbove) setupDns()
+          flushDns()
+
           notifyForegroundAlert(getString(R.string.forward_success),
             getString(R.string.service_running).format(config.profileName))
           changeState(State.CONNECTED)