From f53936421d47ed0e73d0cd767d070d11cee12f57 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 23 Oct 2016 11:54:39 +0800 Subject: [PATCH 1/2] Fix #951 --- .../scala/com/github/shadowsocks/ShadowsocksNatService.scala | 3 ++- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala index 3c446d3f..cf472ae0 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala @@ -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) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 7d226548..7c9c6861 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -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) } From 7a7cbf58034ee8efbaf28a89f679170c5583f32f Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 23 Oct 2016 12:07:04 +0800 Subject: [PATCH 2/2] Update travis-ci --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7055a5cd..e045af7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,8 @@ cache: android: components: - tools - - build-tools-25 + - android-25 + - build-tools-25.0.0 - extra-android-m2repository - extra-google-m2repository