Commit 0b6fe8a4 authored by Max Lv's avatar Max Lv

Refine connection test

parent 51d1a0d5
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</plurals> </plurals>
<string name="connection_test_pending">点击检查是否接入互联网。</string> <string name="connection_test_pending">点击检查是否接入互联网。</string>
<string name="connection_test_testing">测试中……</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">失败:%s</string>
<string name="connection_test_error_status_code">状态码无效。(#%d)</string> <string name="connection_test_error_status_code">状态码无效。(#%d)</string>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</plurals> </plurals>
<string name="connection_test_pending">Tap to check Internet connection availability.</string> <string name="connection_test_pending">Tap to check Internet connection availability.</string>
<string name="connection_test_testing">Testing…</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">Fail: %s</string>
<string name="connection_test_error_status_code">Invalid status code. (#%d)</string> <string name="connection_test_error_status_code">Invalid status code. (#%d)</string>
......
...@@ -209,7 +209,7 @@ class Shadowsocks ...@@ -209,7 +209,7 @@ class Shadowsocks
def updateTraffic(): Unit = if (trafficCache == null) callback.trafficUpdated(TrafficMonitor.getTxRate, def updateTraffic(): Unit = if (trafficCache == null) callback.trafficUpdated(TrafficMonitor.getTxRate,
TrafficMonitor.getRxRate, TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal) else { TrafficMonitor.getRxRate, TrafficMonitor.getTxTotal, TrafficMonitor.getRxTotal) else {
if (connectionTestResult == null) connectionTestResult = getString(R.string.connection_test_pending) 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) def attachService: Unit = attachService(callback)
......
...@@ -364,7 +364,6 @@ class ShadowsocksNatService extends BaseService { ...@@ -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 " + 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", "-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(cmd_bypass.replace("-d 0.0.0.0", "--dport 53"))
init_sb.append(Utils.getIptables init_sb.append(Utils.getIptables
......
...@@ -40,6 +40,8 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan ...@@ -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 // 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 autoDisconnect(new URL("https", "www.google.com", "/generate_204").openConnection
.asInstanceOf[HttpURLConnection]) { conn => .asInstanceOf[HttpURLConnection]) { conn =>
conn.setConnectTimeout(5 * 1000)
conn.setReadTimeout(5 * 1000)
conn.setInstanceFollowRedirects(false) conn.setInstanceFollowRedirects(false)
conn.setUseCaches(false) conn.setUseCaches(false)
if (testCount == id) { if (testCount == id) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment