up 1.8.1

V2rayNG/app/build.gradle

@@ -18,8 +18,8 @@ android {
         minSdkVersion 21
         targetSdkVersion Integer.parseInt("$targetSdkVer")
         multiDexEnabled true
-        versionCode 504
-        versionName "1.8.0"
+        versionCode 506
+        versionName "1.8.1"
     }
 
     if (props["sign"]) {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt

@@ -158,6 +158,7 @@ class ServerActivity : BaseActivity() {
                         container_spider_x?.visibility = View.GONE
                     } else {
                         container_allow_insecure?.visibility = View.GONE
+                        container_alpn?.visibility = View.GONE
                         container_public_key?.visibility = View.VISIBLE
                         container_short_id?.visibility = View.VISIBLE
                         container_spider_x?.visibility = View.VISIBLE

V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt

@@ -342,8 +342,11 @@ object AngConfigManager {
                         queryParam["host"], queryParam["path"], queryParam["seed"], queryParam["quicSecurity"], queryParam["key"],
                         queryParam["mode"], queryParam["serviceName"])
                 fingerprint = queryParam["fp"] ?: ""
+                val pbk = queryParam["pbk"] ?: ""
+                val sid = queryParam["sid"] ?: ""
+                val spx =  Utils.urlDecode(queryParam["spx"] ?: "")
                 streamSetting.populateTlsSettings(queryParam["security"] ?: "", allowInsecure,
-                        queryParam["sni"] ?: sni, fingerprint, queryParam["alpn"], null, null, null)
+                        queryParam["sni"] ?: sni, fingerprint, queryParam["alpn"], pbk, sid, spx)
             }
             if (config == null){
                 return R.string.toast_incorrect_protocol
@@ -544,6 +547,15 @@ object AngConfigManager {
                         if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
                             dicQuery["fp"] = tlsSetting.fingerprint!!
                         }
+                        if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
+                            dicQuery["pbk"] = tlsSetting.publicKey!!
+                        }
+                        if (!TextUtils.isEmpty(tlsSetting.shortId)) {
+                            dicQuery["sid"] = tlsSetting.shortId!!
+                        }
+                        if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
+                            dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX!!)
+                        }
                     }
                     dicQuery["type"] = streamSetting.network.ifEmpty { V2rayConfig.DEFAULT_NETWORK }
 

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -44,7 +44,7 @@
     <string name="server_lab_network">传输协议(network)</string>
     <string name="server_lab_more_function">底层传输方式(transport)</string>
     <string name="server_lab_head_type">伪装类型(type)</string>
-    <string name="server_lab_mode_type">gRPC 传输模式 (mode)</string>
+    <string name="server_lab_mode_type">gRPC 传输模式(mode)</string>
     <string name="server_lab_request_host">伪装域名(host)(host/ws host/h2 host)/QUIC 加密方式</string>
     <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密密钥/kcp seed/gRPC serviceName</string>
     <string name="server_lab_stream_security">传输层安全(TLS)</string>

V2rayNG/app/src/main/res/values/strings.xml

@@ -61,8 +61,8 @@
     <string name="server_lab_security4">User(Optional)</string>
     <string name="server_lab_encryption">encryption</string>
     <string name="server_lab_flow">flow</string>
-    <string name="server_lab_public_key" translatable="false">Public key</string>
-    <string name="server_lab_short_id" translatable="false">Short Id</string>
+    <string name="server_lab_public_key" translatable="false">PublicKey</string>
+    <string name="server_lab_short_id" translatable="false">ShortId</string>
     <string name="server_lab_spider_x" translatable="false">SpiderX</string>
     <string name="toast_success">Success</string>
     <string name="toast_failure">Failure</string>