Commit 54c696d0 authored by Mygod's avatar Mygod

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

parents c4d9edc2 7a7cbf58
...@@ -27,7 +27,8 @@ cache: ...@@ -27,7 +27,8 @@ cache:
android: android:
components: components:
- tools - tools
- build-tools-25 - android-25
- build-tools-25.0.0
- extra-android-m2repository - extra-android-m2repository
- extra-google-m2repository - extra-google-m2repository
......
...@@ -332,7 +332,8 @@ class ShadowsocksNatService extends BaseService { ...@@ -332,7 +332,8 @@ class ShadowsocksNatService extends BaseService {
handleConnection() handleConnection()
AclSyncJob.schedule(profile.route) if (profile.route != Route.ALL)
AclSyncJob.schedule(profile.route)
changeState(State.CONNECTED) changeState(State.CONNECTED)
notification = new ShadowsocksNotification(this, profile.name, true) notification = new ShadowsocksNotification(this, profile.name, true)
......
...@@ -164,7 +164,8 @@ class ShadowsocksVpnService extends VpnService with BaseService { ...@@ -164,7 +164,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
handleConnection() handleConnection()
changeState(State.CONNECTED) changeState(State.CONNECTED)
AclSyncJob.schedule(profile.route) if (profile.route != Route.ALL)
AclSyncJob.schedule(profile.route)
notification = new ShadowsocksNotification(this, profile.name) notification = new ShadowsocksNotification(this, profile.name)
} }
......
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