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

2016-10-23 13:13:44 +08:00
parent c4d9edc224 7a7cbf5803
commit 54c696d00a
3 changed files with 6 additions and 3 deletions
@@ -27,7 +27,8 @@ cache:
 android:
    components:
        - tools
-        - build-tools-25
+        - android-25
+        - build-tools-25.0.0
        - extra-android-m2repository
        - extra-google-m2repository

@@ -332,7 +332,8 @@ class ShadowsocksNatService extends BaseService {

    handleConnection()

-    AclSyncJob.schedule(profile.route)
+    if (profile.route != Route.ALL)
+      AclSyncJob.schedule(profile.route)

    changeState(State.CONNECTED)
    notification = new ShadowsocksNotification(this, profile.name, true)
@@ -164,7 +164,8 @@ class ShadowsocksVpnService extends VpnService with BaseService {
    handleConnection()
    changeState(State.CONNECTED)

-    AclSyncJob.schedule(profile.route)
+    if (profile.route != Route.ALL)
+      AclSyncJob.schedule(profile.route)

    notification = new ShadowsocksNotification(this, profile.name)
  }