From ac0a8c760015b951d731a85b2204ecf9dd63ff03 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sat, 24 Sep 2016 10:59:24 +0800 Subject: [PATCH] Bump version --- kcptun/kcptun | 2 +- src/main/AndroidManifest.xml | 4 ++-- .../scala/com/github/shadowsocks/BaseService.scala | 11 ----------- .../github/shadowsocks/ShadowsocksNatService.scala | 2 +- .../github/shadowsocks/ShadowsocksVpnService.scala | 2 +- .../com/github/shadowsocks/utils/Constants.scala | 2 -- 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/kcptun/kcptun b/kcptun/kcptun index 46dd8eab..ced94f78 160000 --- a/kcptun/kcptun +++ b/kcptun/kcptun @@ -1 +1 @@ -Subproject commit 46dd8eab14587d88d37d5d36146f0a059f254949 +Subproject commit ced94f782036ce0bca1a8a1dfffd5ecd570bb204 diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 0c2a497f..2413456c 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="159" + android:versionName="3.1.7"> diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala index 9e2cea4d..393dece4 100644 --- a/src/main/scala/com/github/shadowsocks/BaseService.scala +++ b/src/main/scala/com/github/shadowsocks/BaseService.scala @@ -298,15 +298,4 @@ trait BaseService extends Service { state = s }) } - - def getBlackList = { - val default = getString(R.string.black_list) - try { - val container = app.containerHolder.getContainer - val update = container.getString("black_list") - if (update == null || update.isEmpty) default else update - } catch { - case ex: Exception => default - } - } } diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index fba0300f..14e4f358 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -192,7 +192,7 @@ class ShadowsocksNatService extends BaseService { val conf = profile.route match { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, - "127.0.0.1", profile.localPort + 53, getBlackList, "", profile.localPort + 63, "") + "127.0.0.1", profile.localPort + 53, "", profile.localPort + 63, "") } case Route.GFWLIST => { ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 11b9d997..8613673e 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -312,7 +312,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { val conf = profile.route match { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, - "0.0.0.0", profile.localPort + 53, getBlackList, ipv6, profile.localPort + 63, ipv6) + "0.0.0.0", profile.localPort + 53, ipv6, profile.localPort + 63, ipv6) } case Route.GFWLIST => { ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, diff --git a/src/main/scala/com/github/shadowsocks/utils/Constants.scala b/src/main/scala/com/github/shadowsocks/utils/Constants.scala index 27768e7a..74f6ca49 100644 --- a/src/main/scala/com/github/shadowsocks/utils/Constants.scala +++ b/src/main/scala/com/github/shadowsocks/utils/Constants.scala @@ -118,8 +118,6 @@ object ConfigUtils { | label = "china-servers"; | ip = 1.2.4.8, 208.67.222.222, 114.114.114.114; | timeout = 4; - | exclude = %s; - | policy = included; | uptest = none; | preset = on; | %s