Bump version

Fix #577
Bump version
2016-02-22 09:00:29 +08:00 · 2016-02-22 08:59:57 +08:00 · 2016-02-18 17:36:19 +08:00 · 2016-02-18 17:31:15 +08:00 · 2016-02-18 17:22:08 +08:00 · 2016-02-18 16:43:45 +08:00
5 changed files with 13 additions and 7 deletions
@@ -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/"

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

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

@@ -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)
@@ -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
+}
Author	SHA1	Message	Date
Max Lv	2eb12ee2ae	Bump version	2016-02-22 09:00:29 +08:00
Max Lv	ef7701982d	Fix #577	2016-02-22 08:59:57 +08:00
Max Lv	bd942c688f	Bump version	2016-02-18 17:36:19 +08:00
Max Lv	3f08a66aab	Merge pull request #574 from JLLK/master Replace Future.onFailure with Future.onComplete	2016-02-18 17:31:15 +08:00
Max Lv	ae0801b71b	Fix #575	2016-02-18 17:22:08 +08:00
Max Lv	241b84976f	Bump version	2016-02-18 16:43:45 +08:00
chentao	b76d089fb2	Avoid MatchError	2016-02-17 11:30:58 +08:00
chentao	2f4cdbce25	Replace Future.onFailure with Future.onComplete	2016-02-16 10:05:43 +08:00