diff --git a/build.gradle b/build.gradle index 8e46e0d..ee28e97 100644 --- 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 index aad36f7..19c2932 100644 --- 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? = getAllProfilesIgnoreGroup(VpnEncrypt.vpnGroupName)): JSONArray? { if (profiles == null) return null val lookup = LongSparseArray(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 index 63d8ee9..d2670fd 100644 --- 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" "Apagado" "Enviar email" "Exportar…" - "Exportar a archivo…" + "SS Exportar a archivo…" "Compartir por LAN" "Verificar conectividad" "Por favor, instala un explorador de archivos como MiXplorer" diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index 18c1724..1b0aed4 100644 --- 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" "Suivre la config système" "Envoyer un email" "Exporter…" - "Exporter dans un fichier…" + "SS Exporter dans un fichier…" "Le trafic HTTP en clair n'est pas sécurisé" "Partager sur le réseau local" "Vérifier la connectivité" diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml index 5bd153c..b4674b8 100644 --- a/core/src/main/res/values-ja/strings.xml +++ b/core/src/main/res/values-ja/strings.xml @@ -180,7 +180,7 @@ "閉じる" "電子メール送信" "エクスポート" - "ファイルへエクスポート" + "SS ファイルへエクスポート" "クリアテキスト(平文)通信は安全ではありません" "LAN経由でシェア" "接続チェック中" diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml index 06ed066..9ea6d39 100644 --- a/core/src/main/res/values-ru/strings.xml +++ b/core/src/main/res/values-ru/strings.xml @@ -173,7 +173,7 @@ "Выкл" "Отправить письмо" "Экспорт…" - "Экспорт в файл…" + "SS Экспорт в файл…" "Текстовый трафик HTTP не защищён" "Поделиться через LAN" "Проверить подключение" diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml index a70464c..cb4773d 100644 --- a/core/src/main/res/values-zh-rCN/strings.xml +++ b/core/src/main/res/values-zh-rCN/strings.xml @@ -167,7 +167,7 @@ "关闭" "发送电子邮件" "导出…" - "导出至文件…" + "SS导出至文件…" "HTTP 明文流量不安全" "通过局域网分享" "检查连接" diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index bc44013..00806f5 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -179,7 +179,7 @@ "關閉" "發送電子郵件" "導出…" - "導出至文件…" + "SS導出至文件…" "HTTP 明文流量不安全" "通過局域網分享" "檢查連接" diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c54e4ab..d28535d 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ Save Log Apply Settings to All Profiles Export… - Export to file… + SS Export to file… Export to Clipboard Import from Clipboard Import from file… diff --git a/gitupdate.bat b/gitupdate.bat index 9fbc86d..9c272b3 100644 --- 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 \ No newline at end of file