Bump version

Replace Future.onFailure with Future.onComplete

project/plugins.sbt

@@ -1,6 +1,6 @@
 resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.16")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.17")
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
-          android:versionCode="129"
+          android:versionCode="132"
-          android:versionName="2.9.7">
+          android:versionName="2.9.10">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/res/values-zh/strings.xml

@@ -96,6 +96,7 @@
   <string-array name="route_entry">
     <item>全局</item>
     <item>绕过局域网地址</item>
+    <item>绕过中国大陆地址</item>
     <item>绕过局域网及中国大陆地址</item>
   </string-array>
 

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -401,7 +401,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       }
     }
 
-    if (config.route == Route.ALL) {
+    if (config.route == Route.ALL || config.route == Route.BYPASS_CHN) {
       builder.addRoute("0.0.0.0", 0)
     } else {
       val privateList = getResources.getStringArray(R.array.bypass_private_route)

src/main/scala/com/github/shadowsocks/package.scala

@@ -2,12 +2,17 @@ package com.github
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
+import scala.util.{Success, Failure, Try}
 
 /**
   * @author Mygod
   */
 package object shadowsocks {
-  def ThrowableFuture[T](f: => T) = Future(f) onFailure {
+
-    case e: Throwable => e.printStackTrace()
+  val handleFailure: PartialFunction[Try[_], Unit] = {
+    case Success(_) =>
+    case Failure(e) => e.printStackTrace()
   }
-}
+
+  def ThrowableFuture[T](f: => T) = Future(f) onComplete handleFailure
+}