update

bannedbook · Jun 20, 2020 · e49b461 · e49b461
1 parent dfea82f
commit e49b461
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 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 = 5000938
-        versionName = '5.1.17-nightly'
+        versionCode = 5000948
+        versionName = '5.1.18-nightly'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/core/src/main/java/com/github/shadowsocks/database/ProfileManager.kt b/core/src/main/java/com/github/shadowsocks/database/ProfileManager.kt
@@ -197,7 +197,7 @@ object ProfileManager {
     fun serializeToJsonIgnoreVPN(profiles: List<Profile>? = getAllProfilesIgnoreGroup(VpnEncrypt.vpnGroupName)): JSONArray? {
         if (profiles == null) return null
         val lookup = LongSparseArray<Profile>(profiles.size).apply { profiles.forEach { put(it.id, it) } }
-        return JSONArray(profiles.map { it.toJson(lookup) }.toTypedArray())
+        return JSONArray(profiles.filter{it.profileType=="ss"}.map { it.toJson(lookup) }.toTypedArray())
     }
 
     /**

diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
@@ -158,7 +158,7 @@ Recibido: \t%4$s\t↓\t%2$s"</string>
     <string name="night_mode_off">"Apagado"</string>
     <string name="send_email">"Enviar email"</string>
     <string name="action_export_more">"Exportar…"</string>
-    <string name="action_export_file">"Exportar a archivo…"</string>
+    <string name="action_export_file">"SS Exportar a archivo…"</string>
     <string name="share_over_lan">"Compartir por LAN"</string>
     <string name="connection_test_pending">"Verificar conectividad"</string>
     <string name="file_manager_missing">"Por favor, instala un explorador de archivos como MiXplorer"</string>

diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
@@ -165,7 +165,7 @@ Reçu : \t\t\t%4$s\t↓\t%2$s"</string>
     <string name="night_mode_system">"Suivre la config système"</string>
     <string name="send_email">"Envoyer un email"</string>
     <string name="action_export_more">"Exporter…"</string>
-    <string name="action_export_file">"Exporter dans un fichier…"</string>
+    <string name="action_export_file">"SS Exporter dans un fichier…"</string>
     <string name="cleartext_http_warning">"Le trafic HTTP en clair n'est pas sécurisé"</string>
     <string name="share_over_lan">"Partager sur le réseau local"</string>
     <string name="connection_test_pending">"Vérifier la connectivité"</string>

diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
@@ -180,7 +180,7 @@
     <string name="night_mode_off">"閉じる"</string>
     <string name="send_email">"電子メール送信"</string>
     <string name="action_export_more">"エクスポート"</string>
-    <string name="action_export_file">"ファイルへエクスポート"</string>
+    <string name="action_export_file">"SS ファイルへエクスポート"</string>
     <string name="cleartext_http_warning">"クリアテキスト（平文）通信は安全ではありません"</string>
     <string name="share_over_lan">"LAN経由でシェア"</string>
     <string name="connection_test_pending">"接続チェック中"</string>

diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
@@ -173,7 +173,7 @@
     <string name="night_mode_off">"Выкл"</string>
     <string name="send_email">"Отправить письмо"</string>
     <string name="action_export_more">"Экспорт…"</string>
-    <string name="action_export_file">"Экспорт в файл…"</string>
+    <string name="action_export_file">"SS Экспорт в файл…"</string>
     <string name="cleartext_http_warning">"Текстовый трафик HTTP не защищён"</string>
     <string name="share_over_lan">"Поделиться через LAN"</string>
     <string name="connection_test_pending">"Проверить подключение"</string>

diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
@@ -167,7 +167,7 @@
     <string name="night_mode_off">"关闭"</string>
     <string name="send_email">"发送电子邮件"</string>
     <string name="action_export_more">"导出…"</string>
-    <string name="action_export_file">"导出至文件…"</string>
+    <string name="action_export_file">"SS导出至文件…"</string>
     <string name="cleartext_http_warning">"HTTP 明文流量不安全"</string>
     <string name="share_over_lan">"通过局域网分享"</string>
     <string name="connection_test_pending">"检查连接"</string>

diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
@@ -179,7 +179,7 @@
     <string name="night_mode_off">"關閉"</string>
     <string name="send_email">"發送電子郵件"</string>
     <string name="action_export_more">"導出…"</string>
-    <string name="action_export_file">"導出至文件…"</string>
+    <string name="action_export_file">"SS導出至文件…"</string>
     <string name="cleartext_http_warning">"HTTP 明文流量不安全"</string>
     <string name="share_over_lan">"通過局域網分享"</string>
     <string name="connection_test_pending">"檢查連接"</string>

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -98,7 +98,7 @@
   <string name="save_log">Save Log</string>
   <string name="action_apply_all">Apply Settings to All Profiles</string>
   <string name="action_export_more">Export…</string>
-  <string name="action_export_file">Export to file…</string>
+  <string name="action_export_file">SS Export to file…</string>
   <string name="action_export">Export to Clipboard</string>
   <string name="action_import">Import from Clipboard</string>
   <string name="action_import_file">Import from file…</string>

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.1.17 -m "release v5.1.17"
+git tag -a v5.1.18 -m "release v5.1.18"
 git push origin --tags
 pause