update

bannedbook · May 8, 2020 · 7a32ad6 · 7a32ad6
1 parent ff833e4
commit 7a32ad6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
         junitVersion = '4.13'
         androidTestVersion = '1.2.0'
         androidEspressoVersion = '3.2.0'
-        versionCode = 5000718
-        versionName = '5.0.6.9-nightly'
+        versionCode = 5000728
+        versionName = '5.0.6.10-nightly'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt b/core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
@@ -21,6 +21,7 @@
 package com.github.shadowsocks.preference
 import SpeedUpVPN.VpnEncrypt
 import android.os.Binder
+import android.util.Log
 import androidx.preference.PreferenceDataStore
 import com.github.shadowsocks.BootReceiver
 import com.github.shadowsocks.Core
@@ -31,6 +32,7 @@ import com.github.shadowsocks.utils.DirectBoot
 import com.github.shadowsocks.utils.Key
 import com.github.shadowsocks.utils.parsePort
 import java.net.InetSocketAddress
+import java.util.*
 
 object DataStore : OnPreferenceDataStoreChangeListener {
     val publicStore = RoomPreferenceDataStore(PublicDatabase.kvPairDao)
@@ -66,7 +68,14 @@ object DataStore : OnPreferenceDataStoreChangeListener {
     val directBootAware: Boolean get() = Core.directBootSupported && canToggleLocked
     val tcpFastOpen: Boolean get() = TcpFastOpen.sendEnabled && publicStore.getBoolean(Key.tfo, false)
     val isAutoUpdateServers: Boolean get() = publicStore.getBoolean(Key.isAutoUpdateServers, true)
-    val is_get_free_servers: Boolean get() = publicStore.getBoolean(Key.is_get_free_servers, false)
+    val is_get_free_servers: Boolean get() {
+        return try {
+            val userCountry=Locale.getDefault().country
+            publicStore.getBoolean(Key.is_get_free_servers, "CN" != userCountry)
+        }catch (t:Throwable){
+            publicStore.getBoolean(Key.is_get_free_servers, true)
+        }
+    }
     val serviceMode get() = publicStore.getString(Key.serviceMode) ?: Key.modeVpn
     val listenAddress get() = if (publicStore.getBoolean(Key.shareOverLan, false)) "0.0.0.0" else "127.0.0.1"
     var portProxy: Int

diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
@@ -195,7 +195,7 @@
     <string name="auto_update_servers">"自动更新服务器"</string>
     <string name="auto_update_servers_summary">"应用启动后自动更新VPN服务器"</string>
     <string name = "get_free_servers">启用第三方服务器</string>
-    <string name = "get_free_servers_summary">从网络抓取第三方免费服务器，安全性未知</string>
+    <string name = "get_free_servers_summary">抓取网络上的免费服务器，安全性未知</string>
     <string name="title_ping_all_server">测试全部配置Tcping</string>
     <string name="title_real_ping_all_server">测试全部配置真连接</string>
     <string name="title_retest_invalid_servers">再测无效服务器</string>

diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
@@ -207,7 +207,7 @@
     <string name="auto_update_servers">"自動更新服務器"</string>
     <string name="auto_update_servers_summary">"應用啟動後自動更新VPN服務器"</string>
     <string name = "get_free_servers">啟用第三方伺服器</string>
-    <string name = "get_free_servers_summary">從網絡抓取第三方免費伺服器，安全性未知</string>
+    <string name = "get_free_servers_summary">抓取網絡上的免費伺服器</string>
     <string name="title_ping_all_server">測試全部配置Tcping</string>
     <string name="title_real_ping_all_server">測試全部配置真連接</string>
     <string name="title_retest_invalid_servers">再測無效伺服器</string>

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -169,7 +169,7 @@
   <string name = "auto_update_servers">Automatic Update Servers</string>
   <string name = "auto_update_servers_summary">Automatically update VPN servers when App launch</string>
   <string name = "get_free_servers">Enable 3rd-party servers</string>
-  <string name = "get_free_servers_summary">Crawl 3rd-party free servers from internet, security unknown.</string>
+  <string name = "get_free_servers_summary">Crawl free servers from internet.</string>
   <string name="title_ping_all_server">Tcping all servers</string>
   <string name="title_real_ping_all_server">Real test all servers</string>
   <string name="title_retest_invalid_servers">Re-test invalid servers</string>

diff --git a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
@@ -62,6 +62,7 @@ import com.google.android.gms.ads.AdView
 import com.google.android.gms.ads.MobileAds
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
+import java.util.*
 
 class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPreferenceDataStoreChangeListener,
         NavigationView.OnNavigationItemSelectedListener {
@@ -203,7 +204,11 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
         connection.connect(this, this)
         DataStore.publicStore.registerChangeListener(this)
         //updateBuiltinServers
-        if(DataStore.isAutoUpdateServers)Core.updateBuiltinServers()
+        if(DataStore.isAutoUpdateServers){
+            Core.updateBuiltinServers()
+            if (DataStore.is_get_free_servers)Core.importFreeSubs()
+        }
+        //Log.e("user-country", Locale.getDefault().country)
     }
 
     override fun onPreferenceDataStoreChanged(store: PreferenceDataStore, key: String) {