From f58301b80be2edf5026a5046fb32813e89374226 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 30 Sep 2016 13:49:16 +0800 Subject: [PATCH] Bump version --- src/main/AndroidManifest.xml | 4 ++-- src/main/res/values/configs.xml | 4 ++++ .../scala/com/github/shadowsocks/BaseService.scala | 11 +++++++++++ .../github/shadowsocks/ShadowsocksNatService.scala | 4 ++-- .../github/shadowsocks/ShadowsocksVpnService.scala | 4 ++-- .../com/github/shadowsocks/utils/Constants.scala | 2 ++ 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 src/main/res/values/configs.xml diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index f2e5454c..2e7a57ea 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="162" + android:versionName="3.2.2"> diff --git a/src/main/res/values/configs.xml b/src/main/res/values/configs.xml new file mode 100644 index 00000000..d9498c59 --- /dev/null +++ b/src/main/res/values/configs.xml @@ -0,0 +1,4 @@ + + + ".appspot.com",".blogspot.com",".blogspot.kr",".blogspot.sg",".cdninstagram.com",".connect.facebook.net",".facebook.br",".facebook.com",".facebook.hu",".facebook.nl",".facebook.se",".fbcdn.net",".google.co.kr",".google.com",".google.com",".google.com.hk",".google.com.sg",".google.com.tw",".googleapis.com",".googleapps.com",".googleartproject.com",".googleblog.com",".googlecode.com",".googlecommerce.com",".googledomains.com",".googledrive.com",".googleearth.com",".googlegroups.com",".googlehosted.com",".googleideas.com",".googlelabs.com",".googlemail.com",".googleplay.com",".googleplus.com",".googlesile.com",".googlesource.com",".googleusercontent.com",".googlevideo.com",".googlezip.net",".gstatic.com",".yahoo.com",".igoogle.com",".instagram.com",".institut-tibetain.org",".nic.google",".registry.google",".thinkwithgoogle.com",".withgoogle.com",".youtube-nocookie.com",".youtube.com",".gvt1.com",".gvt2.com",".gvt3.com",".1e100.net" + diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala index 393dece4..aacd3cee 100644 --- a/src/main/scala/com/github/shadowsocks/BaseService.scala +++ b/src/main/scala/com/github/shadowsocks/BaseService.scala @@ -298,4 +298,15 @@ trait BaseService extends Service { state = s }) } + + def getBlackList = { + val default = "exclude = " + getString(R.string.black_list) + ";" + try { + val container = app.containerHolder.getContainer + val update = "exclude = " + 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 24dc5b4c..320d79d7 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -184,12 +184,12 @@ class ShadowsocksNatService extends BaseService { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, "127.0.0.1", profile.localPort + 53, "1.2.4.8, 114.114.114.114", - reject, profile.localPort + 63, reject) + getBlackList, reject, profile.localPort + 63, reject) } case Route.CHINALIST => { 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) + "", reject, profile.localPort + 63, reject) } case _ => { ConfigUtils.PDNSD_LOCAL.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 292a5c7c..80125829 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -301,12 +301,12 @@ class ShadowsocksVpnService extends VpnService with BaseService { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, "0.0.0.0", profile.localPort + 53, "1.2.4.8, 114.114.114.114", - reject, profile.localPort + 63, reject) + getBlackList, reject, profile.localPort + 63, reject) } case Route.CHINALIST => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, "0.0.0.0", profile.localPort + 53, "8.8.8.8, 208.67.222.222", - reject, profile.localPort + 63, reject) + "", reject, profile.localPort + 63, reject) } case _ => { ConfigUtils.PDNSD_LOCAL.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 d2197ccd..db8bf0a1 100644 --- a/src/main/scala/com/github/shadowsocks/utils/Constants.scala +++ b/src/main/scala/com/github/shadowsocks/utils/Constants.scala @@ -117,6 +117,8 @@ object ConfigUtils { | ip = %s; | timeout = 3; | query_method = udp_only; + | %s + | policy = included; | reject = %s; | reject_policy = fail; | reject_recursively = on;