diff --git a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt index f534c8cb..e3cce8f6 100644 --- a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt +++ b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt @@ -166,9 +166,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe */ private fun testConnection(id: Int) { val (success, result) = try { - val urlString = when (app.currentProfile!!.route) { - Acl.CHINALIST -> DataStore.testUrlChinaList - else -> DataStore.testUrl} + val urlString = DataStore.testUrl val url = URL(urlString) if (url.protocol != "https") throw MalformedURLException(getString(R.string.connection_test_url_non_https, urlString)) diff --git a/mobile/src/main/java/com/github/shadowsocks/preference/DataStore.kt b/mobile/src/main/java/com/github/shadowsocks/preference/DataStore.kt index 61b61ad6..9cce48a3 100644 --- a/mobile/src/main/java/com/github/shadowsocks/preference/DataStore.kt +++ b/mobile/src/main/java/com/github/shadowsocks/preference/DataStore.kt @@ -54,9 +54,6 @@ object DataStore { var testUrl: String get() = publicStore.getString(Key.testUrl) ?: "https://www.google.com/generate_204" set(value) = publicStore.putString(Key.testUrl, value) - var testUrlChinaList: String - get() = publicStore.getString(Key.testUrlChinaList) ?: "https://www.qualcomm.cn/generate_204" - set(value) = publicStore.putString(Key.testUrlChinaList, value) var serviceMode: String get() = publicStore.getString(Key.serviceMode) ?: Key.modeVpn set(value) = publicStore.putString(Key.serviceMode, value) @@ -73,7 +70,6 @@ object DataStore { fun initGlobal() { // temporary workaround for support lib bug if (publicStore.getString(Key.testUrl) == null) testUrl = testUrl - if (publicStore.getString(Key.testUrlChinaList) == null) testUrlChinaList = testUrlChinaList if (publicStore.getString(Key.serviceMode) == null) serviceMode = serviceMode if (publicStore.getString(Key.portProxy) == null) portProxy = portProxy if (publicStore.getString(Key.portLocalDns) == null) portLocalDns = portLocalDns diff --git a/mobile/src/main/java/com/github/shadowsocks/utils/Constants.kt b/mobile/src/main/java/com/github/shadowsocks/utils/Constants.kt index 1c841cdc..6b81b5ba 100644 --- a/mobile/src/main/java/com/github/shadowsocks/utils/Constants.kt +++ b/mobile/src/main/java/com/github/shadowsocks/utils/Constants.kt @@ -50,7 +50,6 @@ object Key { const val udpdns = "isUdpDns" const val ipv6 = "isIpv6" const val testUrl = "testUrl" - const val testUrlChinaList = "testUrlChinaList" const val host = "proxy" const val password = "sitekey" diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index ee7fbac2..f81e30e8 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ Sent: \t\t\t\t\t%3$s\t↑\t%1$s\nReceived: \t%4$s\t↓\t%2$s %s/s Connection Test URL - Connection Test URL (China List mode only) Check Connectivity Testing… Success: %dms latency diff --git a/mobile/src/main/res/xml/pref_global.xml b/mobile/src/main/res/xml/pref_global.xml index bfd81e2d..ccfb1ea9 100644 --- a/mobile/src/main/res/xml/pref_global.xml +++ b/mobile/src/main/res/xml/pref_global.xml @@ -16,10 +16,6 @@ android:key="testUrl" android:title="@string/connection_test_url" app:pref_summaryHasText="%s"/> -