update

bannedbook · Jul 3, 2020 · da8ce90 · da8ce90
1 parent 786a41b
commit da8ce90
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
         compileSdkVersion = 29
         buildToolsVersion = '29.0.3'
         desugarLibsVersion = '1.0.5'
-        versionCode = 442
-        versionName = '5.0.6.10R'
+        versionCode = 443
+        versionName = '5.0.6.11R'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
@@ -183,7 +183,7 @@
     <string name="toast_test_ended">啊!测试结束啦!</string>
     <string name="toast_test_interrupted">"服务器：%s或前一个服务器导致测试中断，请检查之。"</string>
     <string name="firstrun_tips_title">"首次启动提示,请仔细阅读或截图保存"</string>
-    <string name="firstrun_tips">"1.自动更新的网络免费服务器包括一些无效服务器，请点右上角三个点的按钮，执行‘测试全部配置真连接’ ，然后再执行‘删除无效/按组排序’ 和 ‘按测速结果排序’ 。然后点击选中一个服务器，再点底部中间的启动VPN的圆形按钮。\n\n2.如果您不想使用自动更新的免费服务器，请在设置选项中禁用第三方服务器。然后您需要添加或导入自己的SSR服务器才能启用VPN连接。"</string>
+    <string name="firstrun_tips">"1.自动更新的网络免费服务器包括一些无效服务器(网络免费服务器来源于网络分享，为方便网友而提供，我们不对其可靠性和安全性做任何保证)，请点右上角三个点的按钮，执行‘测试全部配置真连接’ ，然后再执行‘删除无效/按组排序’ 和 ‘按测速结果排序’，然后点击选中一个服务器，再点底部中间的启动VPN的圆形按钮。\n\n2.如果您不想使用自动更新的免费服务器，请在设置选项中禁用第三方服务器。然后您需要添加或导入自己的SSR服务器才能启用VPN连接。"</string>
     <string name="recommended_site_1">"<![CDATA[
 <html xmlns='http://www.w3.org/1999/xhtml' dir='ltr' lang='zh-CN'>
 <head profile='http://gmpg.org/xfn/11'>

diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
@@ -192,7 +192,7 @@
     <string name="toast_test_ended">啊!測試結束啦!</string>
     <string name="toast_test_interrupted">"伺服器：%s或前一個伺服器導致測試中斷，請檢查之。"</string>
     <string name="firstrun_tips_title">"首次啟動提示,請仔細閱讀或截圖保存"</string>
-    <string name="firstrun_tips">"自動更新的網路免費伺服器包括一些無效伺服器，請點右上角三個點的按鈕，執行‘測試全部配置真連接’ ，然後再執行‘刪除無效/按組排序’ 和 ‘按測速結果排序’。然後點擊選中一個服務器，再點底部中間的啟動VPN的圓形按鈕。"</string>
+    <string name="firstrun_tips">"1.自動更新的網路免費伺服器包括一些無效伺服器(網絡免費伺服器來源於網絡分享，為方便網友而提供，我們不對其可靠性和安全性做任何保證)，請點右上角三個點的按鈕，執行‘測試全部配置真連接’ ，然後再執行‘刪除無效/按組排序’ 和 ‘按測速結果排序’。然後點擊選中一個伺服器，再點底部中間的啟動VPN的圓形按鈕。\n\n2.如果您不想使用網絡免費伺服器，可在设置选项中禁用第三方伺服器后继续使用内建伺服器。"</string>
     <string name="recommended_site_1"><![CDATA[
     <html>
     <body style=\'margin:0;padding:0;font-size:14px;text-align:right\'>

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -191,7 +191,7 @@
   <string name="toast_test_ended">The test ended successfully</string>
   <string name="toast_test_interrupted">Server:%s or the previous one caused the test to be interrupted, please check them.</string>
   <string name="firstrun_tips_title">First run tips,please read carefully or take screenshot.</string>
-  <string name="firstrun_tips">The free servers that are automatically updated include some invalid servers. Before start vpn, please click the three dots button at the upper right corner and execute \'Real test all servers\', and then execute \'Remove invalid/Sort by group\' and \'Sort servers by speed\'. Then click to select a server, and then click the round button at the bottom to start VPN connection.</string>
+  <string name="firstrun_tips">1.The internet free SSR servers that are automatically updated include some invalid servers(they come from internet sharing and are provided for the convenience, we do not guarantee their reliability and security), before start vpn, please click the three dots button at the upper right corner and execute \'Real test all servers\', and then \'Remove invalid/Sort by group\' and \'Sort servers by speed\', then click to select a server, finally click the round button at the bottom to start VPN connection.\n\n2.If you do not want to use free Internet SSR servers, you can continue to use the built-in SSR servers after disabling the 3rd-party servers in app setting.</string>
   <string name="recommended_site_1">"<![CDATA[
 <html xmlns='http://www.w3.org/1999/xhtml'>
 <head profile='http://gmpg.org/xfn/11'>

diff --git a/gitupdate.bat b/gitupdate.bat
@@ -3,6 +3,6 @@ git pull origin master
 git add -A
 git commit -m "update"
 git push origin master
-git tag -a v5.0.6.10 -m "release v5.0.6.10"
+git tag -a v5.0.6.11 -m "release v5.0.6.11"
 git push origin --tags
 pause
diff --git a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
@@ -229,11 +229,11 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
     override fun onResume() {
         super.onResume()
         try {
-            if (prefs!!.getBoolean("firstrun", true)) {
+            if (prefs!!.getBoolean("firstrun2", true)) {
                 // Do first run stuff here then set 'firstrun' as false
                 Core.alertMessage(getString(R.string.firstrun_tips), this,getString(R.string.firstrun_tips_title))
                 // using the following line to edit/commit prefs
-                prefs!!.edit().putBoolean("firstrun", false).commit()
+                prefs!!.edit().putBoolean("firstrun2", false).commit()
             }
         }catch (e:Throwable){}
     }