From 408e74384ed6f96ec98b4f3fcb78d46a9d3fd723 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Fri, 20 Nov 2015 00:39:47 +0800
Subject: [PATCH 1/3] Debugging an HTC device

---
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala      | 2 +-
 .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 1257cbe0..46a15cf0 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -337,7 +337,7 @@ class Shadowsocks
         if (intent != null) {
           startActivityForResult(intent, Shadowsocks.REQUEST_CONNECT)
         } else {
-          onActivityResult(Shadowsocks.REQUEST_CONNECT, Activity.RESULT_OK, null)
+          handler.post(() => onActivityResult(Shadowsocks.REQUEST_CONNECT, Activity.RESULT_OK, null))
         }
       } else {
         serviceStart()
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index 34b76279..28c43504 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -442,11 +442,14 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     try {
       conn = builder.establish()
+      if (conn == null) throw new Exception("Application not prepared.")
     } catch {
       case ex: IllegalStateException =>
         changeState(State.STOPPED, ex.getMessage)
         conn = null
-      case ex: Exception => conn = null
+      case ex: Exception =>
+        ex.printStackTrace()
+        conn = null
     }
 
     if (conn == null) {

From 946affb219fe126b2d33775576e0f870996de3f6 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Fri, 20 Nov 2015 08:58:13 +0800
Subject: [PATCH 2/3] Fix #437

---
 src/main/res/values-zh/strings.xml                              | 1 +
 src/main/res/values/strings.xml                                 | 1 +
 .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 75a7070a..4b85f2bb 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -40,6 +40,7 @@
   <string name="stop">停止服务</string>
   <string name="stopping">正在关闭……</string>
   <string name="vpn_error">后台服务启动失败：%s</string>
+  <string name="reboot_required">VPN 服务启动失败。你可能需要重启设备。</string>
   <string name="close">关闭</string>
   <string name="proxy_empty">代理服务器地址不能为空</string>
   <string name="connect">连接</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bc12046f..afeb12ab 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -66,6 +66,7 @@
   <string name="stop">Stop the service</string>
   <string name="stopping">Shutting down…</string>
   <string name="vpn_error">%s</string>
+  <string name="reboot_required">Failed to start VPN service. You might need to reboot your device.</string>
 
   <!-- alert category -->
   <string name="close">Close</string>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index 28c43504..7197e3c9 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -442,7 +442,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
 
     try {
       conn = builder.establish()
-      if (conn == null) throw new Exception("Application not prepared.")
+      if (conn == null) changeState(State.STOPPED, getString(R.string.reboot_required))
     } catch {
       case ex: IllegalStateException =>
         changeState(State.STOPPED, ex.getMessage)

From 6766b8c3a3dd6b70931b042234d4708a0df84fed Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Fri, 20 Nov 2015 09:13:14 +0800
Subject: [PATCH 3/3] Update dependency

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5ca86e4f..217b0486 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 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.8")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.9")
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")