Commit ac0a8c76 authored by Max Lv's avatar Max Lv

Bump version

parent 63fc69f4
Subproject commit 46dd8eab14587d88d37d5d36146f0a059f254949 Subproject commit ced94f782036ce0bca1a8a1dfffd5ecd570bb204
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks" xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
android:versionCode="158" android:versionCode="159"
android:versionName="3.1.6"> android:versionName="3.1.7">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
...@@ -298,15 +298,4 @@ trait BaseService extends Service { ...@@ -298,15 +298,4 @@ trait BaseService extends Service {
state = s 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
}
}
} }
...@@ -192,7 +192,7 @@ class ShadowsocksNatService extends BaseService { ...@@ -192,7 +192,7 @@ class ShadowsocksNatService extends BaseService {
val conf = profile.route match { val conf = profile.route match {
case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => {
ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, 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 => { case Route.GFWLIST => {
ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
......
...@@ -312,7 +312,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -312,7 +312,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val conf = profile.route match { val conf = profile.route match {
case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN => {
ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, 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 => { case Route.GFWLIST => {
ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir, ConfigUtils.PDNSD_UDP.formatLocal(Locale.ENGLISH, getApplicationInfo.dataDir,
......
...@@ -118,8 +118,6 @@ object ConfigUtils { ...@@ -118,8 +118,6 @@ object ConfigUtils {
| label = "china-servers"; | label = "china-servers";
| ip = 1.2.4.8, 208.67.222.222, 114.114.114.114; | ip = 1.2.4.8, 208.67.222.222, 114.114.114.114;
| timeout = 4; | timeout = 4;
| exclude = %s;
| policy = included;
| uptest = none; | uptest = none;
| preset = on; | preset = on;
| %s | %s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment