refine icon,update ssr-libev

Author: esdeathlove

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="294"
-          android:versionName="3.3.9">
+          android:versionCode="296"
+          android:versionName="3.3.9.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/jni/shadowsocks-libev

@@ -7,5 +7,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11 17c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1zm0-14v4h2V5.08c3.39.49 6 3.39 6 6.92 0 3.87-3.13 7-7 7s-7-3.13-7-7c0-1.68.59-3.22 1.58-4.42L12 13l1.41-1.41-6.8-6.8v.02C4.42 6.45 3 9.05 3 12c0 4.97 4.02 9 9 9 4.97 0 9-4.03 9-9s-4.03-9-9-9h-1zm7 9c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zM6 12c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z"/>
+        android:pathData="M7 2v11h3v9l7-12h-4l4-8z"/>
 </vector>

src/main/res/drawable/ic_click.xml

@@ -7,5 +7,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M11 17c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1zm0-14v4h2V5.08c3.39.49 6 3.39 6 6.92 0 3.87-3.13 7-7 7s-7-3.13-7-7c0-1.68.59-3.22 1.58-4.42L12 13l1.41-1.41-6.8-6.8v.02C4.42 6.45 3 9.05 3 12c0 4.97 4.02 9 9 9 4.97 0 9-4.03 9-9s-4.03-9-9-9h-1zm7 9c0-.55-.45-1-1-1s-1 .45-1 1 .45 1 1 1 1-.45 1-1zM6 12c0 .55.45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1z"/>
+        android:pathData="M3 2v12h3v9l7-12H9l4-9H3zm16 0h-2l-3.2 9h1.9l.7-2h3.2l.7 2h1.9L19 2zm-2.15 5.65L18 4l1.15 3.65h-2.3z"/>
 </vector>

src/main/res/drawable/ic_click_white.xml

@@ -75,6 +75,7 @@ class ShadowsocksNatService extends BaseService {
   var pdnsdProcess: GuardedProcess = _
   var su: Shell.Interactive = _
   var proxychains_enable: Boolean = false
+  var host_arg = ""
 
   def startShadowsocksDaemon() {
 
@@ -88,6 +89,7 @@ class ShadowsocksNatService extends BaseService {
     val cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-local", "-x"
           , "-b" , "127.0.0.1"
           , "-t" , "600"
+          , "--host", host_arg
           , "-P", getApplicationInfo.dataDir
           , "-c" , getApplicationInfo.dataDir + "/ss-local-nat.conf")
 
@@ -120,6 +122,7 @@ class ShadowsocksNatService extends BaseService {
       val cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-local"
         , "-u"
         , "-t" , "60"
+        , "--host", host_arg
         , "-b" , "127.0.0.1"
         , "-l" , (profile.localPort + 53).toString
         , "-P" , getApplicationInfo.dataDir
@@ -151,7 +154,8 @@ class ShadowsocksNatService extends BaseService {
       })
 
       val cmdBuf = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-local"
-        , "-t" , "10"
+        , "-t" , "60"
+        , "--host", host_arg
         , "-b" , "127.0.0.1"
         , "-l" , (profile.localPort + 63).toString
         , "-P", getApplicationInfo.dataDir
@@ -385,6 +389,7 @@ class ShadowsocksNatService extends BaseService {
       proxychains_enable = false
     }
 
+    host_arg = profile.host
     if (!Utils.isNumeric(profile.host)) Utils.resolve(profile.host, enableIPv6 = true) match {
       case Some(a) => profile.host = a
       case None => throw NameNotResolvedException()

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

@@ -72,6 +72,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
   var pdnsdProcess: GuardedProcess = _
   var tun2socksProcess: GuardedProcess = _
   var proxychains_enable: Boolean = false
+  var host_arg = ""
 
   override def onBind(intent: Intent): IBinder = {
     val action = intent.getAction
@@ -164,6 +165,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     killProcesses()
 
     // Resolve the server address
+    host_arg = profile.host
     if (!Utils.isNumeric(profile.host)) Utils.resolve(profile.host, enableIPv6 = true) match {
       case Some(addr) => profile.host = addr
       case None => throw NameNotResolvedException()
@@ -213,6 +215,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     var cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-local", "-V", "-U", "-x"
       , "-b", "127.0.0.1"
       , "-t", "600"
+      , "--host", host_arg
       , "-P", getApplicationInfo.dataDir
       , "-c", getApplicationInfo.dataDir + "/ss-local-udp-vpn.conf")
 
@@ -247,6 +250,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     val cmd = ArrayBuffer[String](getApplicationInfo.dataDir + "/ss-local", "-V", "-x"
       , "-b", "127.0.0.1"
       , "-t", "600"
+      , "--host", host_arg
       , "-P", getApplicationInfo.dataDir
       , "-c", getApplicationInfo.dataDir + "/ss-local-vpn.conf")
 
@@ -290,6 +294,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
       , "-V"
       , "-u"
       , "-t", "60"
+      , "--host", host_arg
       , "-b", "127.0.0.1"
       , "-P", getApplicationInfo.dataDir
       , "-c", getApplicationInfo.dataDir + "/ss-tunnel-vpn.conf")