diff --git a/kcptun/kcptun b/kcptun/kcptun index c9188299..91b2c650 160000 --- a/kcptun/kcptun +++ b/kcptun/kcptun @@ -1 +1 @@ -Subproject commit c91882990d1e39acbf4cc98c63e5a7a5fc8da1c6 +Subproject commit 91b2c650d128285f8a5f8305696d4c5ccdbe8e5f diff --git a/project/plugins.sbt b/project/plugins.sbt index 21b0ecc8..3ee67d67 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.14") +addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.15") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10") diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 6e322bf0..6923e844 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="150" + android:versionName="3.0.8"> diff --git a/src/main/scala/com/github/shadowsocks/GuardedProcess.scala b/src/main/scala/com/github/shadowsocks/GuardedProcess.scala index 7a4c7ef1..763dd7fb 100644 --- a/src/main/scala/com/github/shadowsocks/GuardedProcess.scala +++ b/src/main/scala/com/github/shadowsocks/GuardedProcess.scala @@ -57,7 +57,9 @@ class StreamLogger(is: InputStream, tag: String) extends Thread { override def run() { withCloseable(new BufferedReader(new InputStreamReader(is))) { - br => Stream.continually(br.readLine()).takeWhile(_ != null).foreach(Log.i(tag, _)) + br => try Stream.continually(br.readLine()).takeWhile(_ != null).foreach(Log.i(tag, _)) catch { + case ignore: IOException => + } } } } diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala index 3a632bb1..ab030ccd 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala @@ -68,7 +68,7 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity { profilesList.setItemAnimator(new DefaultItemAnimator) profilesList.setAdapter(profilesAdapter) if (app.profileId >= 0) lm.scrollToPosition(profilesAdapter.profiles.zipWithIndex.collectFirst { - case (profile, i) if profile.id == app.profileId => i + 1 + case (profile, i) if profile.id == app.profileId => i }.getOrElse(0)) } }