refine the IPC to tun2socks

project/plugins.sbt

@@ -1,7 +1,7 @@
 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.4.6")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.7")
 
-resolvers += Resolver.sbtPluginRepo("snapshots")
+resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
-addSbtPlugin("com.hanhuy.sbt" % "sbt-idea" % "1.7.0-SNAPSHOT")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.7.0-SNAPSHOT")

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="109"
+    android:versionCode="111"
-    android:versionName="2.7.1">
+    android:versionName="2.7.3">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

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

@@ -932,10 +932,14 @@ class Shadowsocks
 
   private def recovery() {
     val h = showProgress(getString(R.string.recovering))
-    serviceStop()
     spawn {
       reset()
-      h.sendEmptyMessage(0)
+      handler.post(new Runnable {
+        override def run() {
+          serviceStop
+          h.sendEmptyMessage(0)
+        }
+      })
     }
   }
 

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

@@ -266,22 +266,23 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     }
 
     val fd = startVpn()
-    if (fd == -1) {
+
-      false
+    if (fd != -1) {
-    } else {
+      var tries = 1
-      Thread.sleep(1000)
+      while (tries < 5) {
-      if (System.sendfd(fd) == -1) {
+        Thread.sleep(1000 * tries)
-        false
+        if (System.sendfd(fd) != -1) {
-      } else {
+          return true
-        true
+        }
+        tries += 1
       }
     }
-
+    false
   }
 
   def startShadowsocksDaemon() {
 
-    if (Utils.isLollipopOrAbove && config.route != Route.ALL) {
+    if (config.route != Route.ALL) {
       val acl: Array[String] = config.route match {
         case Route.BYPASS_LAN => getResources.getStringArray(R.array.private_route)
         case Route.BYPASS_CHN => getResources.getStringArray(R.array.chn_route_full)