Commit 30fea4a7 authored by Max Lv's avatar Max Lv

Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

parents 6df227d2 7c0763c7
Subproject commit c91882990d1e39acbf4cc98c63e5a7a5fc8da1c6
Subproject commit 91b2c650d128285f8a5f8305696d4c5ccdbe8e5f
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")
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
android:versionCode="149"
android:versionName="3.0.7">
android:versionCode="150"
android:versionName="3.0.8">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
......@@ -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 =>
}
}
}
}
......
......@@ -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))
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment