Bump version

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="162"
+          android:versionCode="163"
-          android:versionName="3.2.2">
+          android:versionName="3.2.3">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/scala/com/github/shadowsocks/BaseService.scala

@@ -70,6 +70,7 @@ trait BaseService extends Service {
   var callbacksCount: Int = _
   lazy val handler = new Handler(getMainLooper)
   lazy val restartHanlder = new Handler(getMainLooper)
+  lazy val protectPath = getApplicationInfo.dataDir + "/protect_path"
 
   private val closeReceiver: BroadcastReceiver = (context: Context, intent: Intent) => {
     Toast.makeText(context, R.string.stopping, Toast.LENGTH_SHORT).show()

src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala

@@ -187,17 +187,17 @@ class ShadowsocksNatService extends BaseService {
 
     val conf = profile.route match {
       case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => {
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "", getApplicationInfo.dataDir,
           "127.0.0.1", profile.localPort + 53, "1.2.4.8, 114.114.114.114",
           getBlackList, reject, profile.localPort + 63, reject)
       }
       case Route.CHINALIST => {
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "", getApplicationInfo.dataDir,
           "127.0.0.1", profile.localPort + 53, "8.8.8.8, 208.67.222.222",
           "", reject, profile.localPort + 63, reject)
       }
       case _ => {
-        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "", getApplicationInfo.dataDir,
           "127.0.0.1", profile.localPort + 53, profile.localPort + 63, reject)
       }
     }

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -193,7 +193,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     val cmd = ArrayBuffer(getApplicationInfo.dataDir + "/kcptun"
       , "-r", profile.host + ":" + profile.kcpPort
       , "-l", "127.0.0.1:" + (profile.localPort + 90)
-      , "--path", getApplicationInfo.dataDir + "/protect_path")
+      , "--path", protectPath)
     try cmd ++= Utils.translateCommandline(profile.kcpcli) catch {
       case exc: Exception => throw KcpcliParseException(exc)
     }
@@ -302,19 +302,20 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
   def startDnsDaemon() {
     val reject = if (profile.ipv6) "224.0.0.0/3" else "224.0.0.0/3, ::/0"
+    val protect = "protect = \"" + protectPath +"\";"
     val conf = profile.route match {
       case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => {
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, protect, getApplicationInfo.dataDir,
           "0.0.0.0", profile.localPort + 53, "114.114.114.114, 119.29.29.29, 1.2.4.8",
           getBlackList, reject, profile.localPort + 63, reject)
       }
       case Route.CHINALIST => {
-        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, protect, getApplicationInfo.dataDir,
           "0.0.0.0", profile.localPort + 53, "8.8.8.8, 8.8.4.4, 208.67.222.222",
           "", reject, profile.localPort + 63, reject)
       }
       case _ => {
-        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
+        ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, protect, getApplicationInfo.dataDir,
           "0.0.0.0", profile.localPort + 53, profile.localPort + 63, reject)
       }
     }

src/main/scala/com/github/shadowsocks/utils/Constants.scala

@@ -69,6 +69,7 @@ object ConfigUtils {
     """
       |global {
       | perm_cache = 2048;
+      | %s
       | cache_dir = "%s";
       | server_ip = %s;
       | server_port = %d;
@@ -101,6 +102,7 @@ object ConfigUtils {
     """
       |global {
       | perm_cache = 2048;
+      | %s
       | cache_dir = "%s";
       | server_ip = %s;
       | server_port = %d;