summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2020-05-06 18:22:30 +0200
committerArne Schwabe <arne@rfc2549.org>2020-05-06 18:56:27 +0200
commit0afb0dcdd4da46b83a836b926c71cf35b410fc46 (patch)
treeb194c93326b589ac9d86f30bb5035f0a955d880d /main
parent72ae846ea9ce4c50441bdc347d86a39231176f3e (diff)
Version 0.7.16
Also update submodules to latest versions
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle.kts4
m---------main/src/main/cpp/asio0
m---------main/src/main/cpp/mbedtls0
m---------main/src/main/cpp/openvpn0
m---------main/src/main/cpp/openvpn30
-rw-r--r--main/src/ui/res/values-zh-rTW/strings.xml1
6 files changed, 2 insertions, 3 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 8b307641..6f9c966f 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -18,8 +18,8 @@ android {
defaultConfig {
minSdkVersion(14)
targetSdkVersion(29) //'Q'.toInt()
- versionCode = 168
- versionName = "0.7.15"
+ versionCode = 169
+ versionName = "0.7.16"
externalNativeBuild {
cmake {
diff --git a/main/src/main/cpp/asio b/main/src/main/cpp/asio
-Subproject 90f32660cd503494b3707840cfbd5434d8e9dab
+Subproject a5c5077e44c451ddc8a50c3717e66dcccc92b07
diff --git a/main/src/main/cpp/mbedtls b/main/src/main/cpp/mbedtls
-Subproject ca933c7e0c9e84738b168b6b0feb89af4183a60
+Subproject b1c8e41ae3b36a9a88e0cbee10ed38a577b5472
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject b3eb7a46c465696b38debfc2d2c1dff8971c403
+Subproject a0ab2fa3a88576c8a0fd311743bc2295f19d8fa
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject 5391351ac2ed1072a6bcff50b29fde52051e4a4
+Subproject f4b9a65591f34d5f154c4fef24643dae49bed02
diff --git a/main/src/ui/res/values-zh-rTW/strings.xml b/main/src/ui/res/values-zh-rTW/strings.xml
index e165b2e4..b34562df 100644
--- a/main/src/ui/res/values-zh-rTW/strings.xml
+++ b/main/src/ui/res/values-zh-rTW/strings.xml
@@ -467,7 +467,6 @@
<string name="openssl_error">OpenSSL 回傳一個錯誤</string>
<string name="running_test">執行測試中...</string>
<string name="test_algoirhtms">測試已選擇的演算法</string>
- <string name="all_app_prompt">\'{\"title\":\"Sign In\",\"type\":\"login\",\"url\":\"/api/v1/generic-sigs/scan\",\"payload\":{\"id\":\"2171e48c-fc70-4edd-b3e5-97c7ec14406e\"}}\'</string>
<string name="openvpn3_nostatickeys">OpenVPN 3 C ++實現不支持靜態密鑰。請在常規設置下更改為OpenVPN 2.x.</string>
<string name="openvpn3_pkcs12">Hi</string>
<string name="proxy">網路代理</string>