Bump version

build.sbt

@@ -31,8 +31,8 @@ resolvers += Resolver.jcenterRepo
 useSupportVectors
 
 libraryDependencies ++= Seq(
-  "com.android.support" % "design" % "24.2.0",
+  "com.android.support" % "design" % "24.2.1",
-  "com.android.support" % "gridlayout-v7" % "24.2.0",
+  "com.android.support" % "gridlayout-v7" % "24.2.1",
   "com.github.clans" % "fab" % "1.6.4",
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
   "com.github.kevinsawicki" % "http-request" % "6.0",

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.16")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.17")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="153"
+          android:versionCode="156"
-          android:versionName="3.1.2">
+          android:versionName="3.1.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

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

@@ -110,6 +110,7 @@
     <item>绕过局域网地址</item>
     <item>绕过中国大陆地址</item>
     <item>绕过局域网及中国大陆地址</item>
+    <item>仅代理国内无法访问的地址</item>
   </string-array>
 
   <string name="action_apply_all">应用设置到所有配置文件</string>

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

@@ -112,6 +112,7 @@
     <item>略過區域網路位址</item>
     <item>略過中國大陸位址</item>
     <item>略過區域網路及中國大陸位址</item>
+    <item>僅代理大陸屏蔽位址</item>
   </string-array>
 
   <string name="action_apply_all">應用設置到所有配置文件</string>

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

@@ -207,7 +207,22 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
   }
 
   def refreshProfile() {
-    profile = app.currentProfile.get
+    profile = app.currentProfile match {
+      case Some(profile) => profile
+      case None => {
+        app.profileManager.getFirstProfile match {
+          case Some(profile) => {
+            app.profileId(profile.id)
+            profile
+          }
+          case None => {
+            val default = app.profileManager.createDefault()
+            app.profileId(default.id)
+            default
+          }
+        }
+      }
+    }
     isProxyApps.setChecked(profile.proxyApps)
   }