Compare commits

...
6 Commits
Author SHA1 Message Date
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
4 changed files with 12 additions and 6 deletions
+1 -1
View File
@@ -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/"
+2 -2
View File
@@ -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="131"
android:versionName="2.9.9">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+1
View File
@@ -96,6 +96,7 @@
<string-array name="route_entry">
<item>全局</item>
<item>绕过局域网地址</item>
<item>绕过中国大陆地址</item>
<item>绕过局域网及中国大陆地址</item>
</string-array>
@@ -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
}