From 0b6fe8a4da5d44669f2bdfd368790dd31eae7a1a Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 16 Dec 2015 13:26:49 +0800
Subject: [PATCH] Refine connection test

---
 src/main/res/values-zh/strings.xml                              | 2 +-
 src/main/res/values/strings.xml                                 | 2 +-
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala         | 2 +-
 .../scala/com/github/shadowsocks/ShadowsocksNatService.scala    | 1 -
 src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala | 2 ++
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 2a2b4c89..6a58ed3b 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -80,7 +80,7 @@
   </plurals>
   <string name="connection_test_pending">点击检查是否接入互联网。</string>
   <string name="connection_test_testing">测试中……</string>
-  <string name="connection_test_available">已接入互联网。（%d 毫秒）</string>
+  <string name="connection_test_available">已接入互联网。（延时：%d 毫秒）</string>
   <string name="connection_test_error">失败：%s</string>
   <string name="connection_test_error_status_code">状态码无效。（#%d）</string>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 177faac6..2affac0a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -21,7 +21,7 @@
   </plurals>
   <string name="connection_test_pending">Tap to check Internet connection availability.</string>
   <string name="connection_test_testing">Testing…</string>
-  <string name="connection_test_available">Internet connection available. (time=%dms)</string>
+  <string name="connection_test_available">Internet connection available. (latency: %dms)</string>
   <string name="connection_test_error">Fail: %s</string>
   <string name="connection_test_error_status_code">Invalid status code. (#%d)</string>
 
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index d1de1e87..cb945a24 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -209,7 +209,7 @@ class Shadowsocks
   def updateTraffic(): Unit = if (trafficCache == null) callback.trafficUpdated(TrafficMonitor.getTxRate,
     TrafficMonitor.getRxRate, TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal) else {
     if (connectionTestResult == null) connectionTestResult = getString(R.string.connection_test_pending)
-    preferences.stat.setSummary(trafficCache + '\n' + connectionTestResult)
+    preferences.stat.setSummary(connectionTestResult + "\n" + trafficCache)
   }
 
   def attachService: Unit = attachService(callback)
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
index 47f91d78..8ca6623d 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
@@ -364,7 +364,6 @@ class ShadowsocksNatService extends BaseService {
       init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-d " + config.proxy))
     }
     init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-d 127.0.0.1"))
-    init_sb.append(cmd_bypass.replace("-p tcp -d 0.0.0.0", "-m owner --uid-owner " + myUid))
     init_sb.append(cmd_bypass.replace("-d 0.0.0.0", "--dport 53"))
 
     init_sb.append(Utils.getIptables
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
index 8af9db6a..51528c54 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
@@ -40,6 +40,8 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
         // Based on: https://android.googlesource.com/platform/frameworks/base/+/master/services/core/java/com/android/server/connectivity/NetworkMonitor.java#640
         autoDisconnect(new URL("https", "www.google.com", "/generate_204").openConnection
           .asInstanceOf[HttpURLConnection]) { conn =>
+          conn.setConnectTimeout(5 * 1000)
+          conn.setReadTimeout(5 * 1000)
           conn.setInstanceFollowRedirects(false)
           conn.setUseCaches(false)
           if (testCount == id) {