Compare commits

...
4 Commits
Author SHA1 Message Date
Max Lv aae068b7b2 fix a UI issue 2015-07-26 10:22:15 +08:00
Max Lv 7626c1117e bump version 2015-07-26 09:36:04 +08:00
Max Lv 1188b59b05 update shadowsocks-libev 2015-07-26 09:10:46 +08:00
Max Lv cbd46d0c95 enable acl on devices before 5.0 2015-07-26 09:10:17 +08:00
3 changed files with 9 additions and 5 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.shadowsocks" package="com.github.shadowsocks"
android:versionCode="109" android:versionCode="110"
android:versionName="2.7.1"> android:versionName="2.7.2">
<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"/>
@@ -932,10 +932,14 @@ class Shadowsocks
private def recovery() { private def recovery() {
val h = showProgress(getString(R.string.recovering)) val h = showProgress(getString(R.string.recovering))
serviceStop()
spawn { spawn {
reset() reset()
h.sendEmptyMessage(0) handler.post(new Runnable {
override def run() {
serviceStop
h.sendEmptyMessage(0)
}
})
} }
} }
@@ -281,7 +281,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
def startShadowsocksDaemon() { def startShadowsocksDaemon() {
if (Utils.isLollipopOrAbove && config.route != Route.ALL) { if (config.route != Route.ALL) {
val acl: Array[String] = config.route match { val acl: Array[String] = config.route match {
case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route) case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route_full) case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route_full)