up 2.0.8

Upgraded Android Gradle Plugin version from 8.13.2 to 9.0.0 in libs.versions.toml. Added and updated several Android and Kotlin build properties in gradle.properties to refine build behavior and feature flags.

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         submodules: 'recursive'
         fetch-depth: '0'
@@ -78,7 +78,7 @@ jobs:
         out-file-path: V2rayNG/app/libs/
 
     - name: Setup Java
-      uses: actions/setup-java@v4.7.0
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
@@ -99,21 +99,21 @@ jobs:
         ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}
     
     - name: Upload arm64-v8a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v6
       if: ${{  success() }}
       with:
         name: arm64-v8a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
 
     - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v6
       if: ${{  success() }}
       with:
         name: armeabi-v7a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
 
     - name: Upload x86 APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v6
       if: ${{  success() }}
       with:
         name: x86-apk

.github/workflows/fastlane.yml

@@ -11,6 +11,6 @@ jobs:
   go:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Validate Fastlane Supply Metadata
         uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.1.0

V2rayNG/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 24
         targetSdk = 36
-        versionCode = 706
+        versionCode = 708
-        versionName = "2.0.6"
+        versionName = "2.0.8"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')

V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt

@@ -97,6 +97,7 @@ object AppConfig {
     const val TAG_FRAGMENT = "fragment"
     const val TAG_DNS = "dns-module"
     const val TAG_DOMESTIC_DNS = "domestic-dns"
+    const val TAG_BALANCER = "proxy-round"
 
     /** Network-related constants. */
     const val UPLINK = "uplink"

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/BaseAdapterListener.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.contracts
 
 /**
  * A common Adapter -> host callback interface that includes common actions: edit, remove and refresh.

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/MainAdapterListener.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.ui
+package com.v2ray.ang.contracts
 
 import com.v2ray.ang.dto.ProfileItem
 

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/ServiceControl.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.contracts
 
 import android.app.Service
 

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/Tun2SocksControl.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.contracts
 
 /**
  * Interface that defines the control operations for tun2socks implementations.

V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlCache.kt

@@ -0,0 +1,6 @@
+package com.v2ray.ang.dto
+
+data class AssetUrlCache(
+    val guid: String,
+    val assetUrl: AssetUrlItem
+)

V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt

@@ -5,6 +5,7 @@ import com.v2ray.ang.AppConfig.PORT_SOCKS
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.TAG_PROXY
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.util.Utils
 
 data class ProfileItem(
@@ -14,6 +15,7 @@ data class ProfileItem(
     var addedTime: Long = System.currentTimeMillis(),
 
     var remarks: String = "",
+    var description: String? = null,
     var server: String? = null,
     var serverPort: String? = null,
 
@@ -42,6 +44,7 @@ data class ProfileItem(
     var insecure: Boolean? = null,
     var echConfigList: String? = null,
     var echForceQuery: String? = null,
+    var pinnedCA256: String? = null,
 
     var publicKey: String? = null,
     var shortId: String? = null,

V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionCache.kt

@@ -0,0 +1,6 @@
+package com.v2ray.ang.dto
+
+data class SubscriptionCache(
+    val guid: String,
+    val subscription: SubscriptionItem
+)

V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt

@@ -2,6 +2,7 @@ package com.v2ray.ang.dto
 
 import com.google.gson.annotations.SerializedName
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.enums.EConfigType
 
 data class V2rayConfig(
     var remarks: String? = null,
@@ -161,7 +162,7 @@ data class V2rayConfig(
             var realitySettings: TlsSettingsBean? = null,
             var grpcSettings: GrpcSettingsBean? = null,
             var hysteriaSettings: HysteriaSettingsBean? = null,
-            var udpmasks: List<UdpMasksBean>? = null,
+            var finalmask: FinalMaskBean? = null,
             val dsSettings: Any? = null,
             var sockopt: SockoptBean? = null
         ) {
@@ -201,15 +202,8 @@ data class V2rayConfig(
                 var downlinkCapacity: Int = 100,
                 var congestion: Boolean = false,
                 var readBufferSize: Int = 1,
-                var writeBufferSize: Int = 1,
+                var writeBufferSize: Int = 1
-                var header: HeaderBean = HeaderBean(),
+            )
-                var seed: String? = null
-            ) {
-                data class HeaderBean(
-                    var type: String = "none",
-                    var domain: String? = null
-                )
-            }
 
             data class WsSettingsBean(
                 var path: String? = null,
@@ -271,6 +265,7 @@ data class V2rayConfig(
                 val enableSessionResumption: Boolean? = null,
                 var echConfigList: String? = null,
                 var echForceQuery: String? = null,
+                var pinnedPeerCertSha256: String? = null,
                 // REALITY settings
                 val show: Boolean = false,
                 var publicKey: String? = null,
@@ -308,13 +303,19 @@ data class V2rayConfig(
                 )
             }
 
-            data class UdpMasksBean(
+            data class FinalMaskBean(
-                var type: String,
+                var tcp: List<MaskBean>? = null,
-                var settings: UdpMasksSettingsBean? = null
+                var udp: List<MaskBean>? = null
             ) {
-                data class UdpMasksSettingsBean(
+                data class MaskBean(
-                    var password: String? = null
+                    var type: String,
-                )
+                    var settings: MaskSettingsBean? = null
+                ) {
+                    data class MaskSettingsBean(
+                        var password: String? = null,
+                        var domain: String? = null
+                    )
+                }
             }
         }
 

V2rayNG/app/src/main/java/com/v2ray/ang/enums/EConfigType.kt

@@ -1,8 +1,7 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 import com.v2ray.ang.AppConfig
 
-
 enum class EConfigType(val value: Int, val protocolScheme: String) {
     VMESS(1, AppConfig.VMESS),
     CUSTOM(2, AppConfig.CUSTOM),
@@ -21,4 +20,4 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
     companion object {
         fun fromInt(value: Int) = entries.firstOrNull { it.value == value }
     }
-}
+}

V2rayNG/app/src/main/java/com/v2ray/ang/enums/Language.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class Language(val code: String) {
     AUTO("auto"),

V2rayNG/app/src/main/java/com/v2ray/ang/enums/NetworkType.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class NetworkType(val type: String) {
     TCP("tcp"),

V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt

@@ -0,0 +1,44 @@
+package com.v2ray.ang.enums
+
+import android.Manifest
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+/**
+ * Permission types used in the app, handling API level differences.
+ */
+enum class PermissionType {
+    /** Camera permission (used for scanning QR codes) */
+    CAMERA {
+        override fun getPermission(): String = Manifest.permission.CAMERA
+    },
+
+    /** Read storage / media permission (adapts to Android version) */
+    READ_STORAGE {
+        override fun getPermission(): String {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            }
+        }
+    },
+
+    /** Notification permission (Android 13+) */
+    POST_NOTIFICATIONS {
+        @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+        override fun getPermission(): String = Manifest.permission.POST_NOTIFICATIONS
+    };
+
+    /** Return the actual Android permission string */
+    abstract fun getPermission(): String
+
+    /** Return a human-readable label for the permission */
+    fun getLabel(): String {
+        return when (this) {
+            CAMERA -> "Camera"
+            READ_STORAGE -> "Storage"
+            POST_NOTIFICATIONS -> "Notification"
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/enums/RoutingType.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class RoutingType(val fileName: String) {
     WHITE("custom_routing_white"),

V2rayNG/app/src/main/java/com/v2ray/ang/enums/VpnInterfaceAddressConfig.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 /**
  * VPN interface address configuration enum class

V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt

@@ -11,6 +11,7 @@ import com.v2ray.ang.AngApplication
 import es.dmoral.toasty.Toasty
 import java.io.Serializable
 import java.net.URI
+import java.util.Locale
 
 val Context.v2RayApplication: AngApplication?
     get() = applicationContext as? AngApplication
@@ -92,7 +93,7 @@ fun Long.toTrafficString(): String {
         size /= DIVISOR
         unitIndex++
     }
-    return String.format("%.1f %s", size, units[unitIndex])
+    return String.format(Locale.getDefault(), "%.1f %s", size, units[unitIndex])
 }
 
 val URI.idnHost: String
@@ -105,6 +106,13 @@ val URI.idnHost: String
  */
 fun String?.removeWhiteSpace(): String? = this?.replace(" ", "")
 
+/**
+ * Returns null if the string is null or blank, otherwise returns the string itself.
+ *
+ * @return The string or null.
+ */
+fun String?.nullIfBlank(): String? = this?.takeIf { it.isNotBlank() }
+
 /**
  * Converts the string to a Long value, or returns 0 if the conversion fails.
  *

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt

@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.util.JsonUtil

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt

@@ -1,9 +1,9 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
@@ -22,17 +22,17 @@ open class FmtBase {
         val query = if (dicQuery != null)
             "?" + dicQuery.toList().joinToString(
                 separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) })
+                transform = { it.first + "=" + Utils.encodeURIComponent(it.second) })
         else ""
 
         val url = String.format(
             "%s@%s:%s",
-            Utils.urlEncode(userInfo ?: ""),
+            Utils.encodeURIComponent(userInfo ?: ""),
             Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
             config.serverPort
         )
 
-        return "${url}${query}#${Utils.urlEncode(config.remarks)}"
+        return "${url}${query}#${Utils.encodeURIComponent(config.remarks)}"
     }
 
     /**
@@ -43,7 +43,7 @@ open class FmtBase {
      */
     fun getQueryParam(uri: URI): Map<String, String> {
         return uri.rawQuery.split("&")
-            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
+            .associate { it.split("=").let { (k, v) -> k to Utils.decodeURIComponent(v) } }
     }
 
     /**
@@ -83,6 +83,7 @@ open class FmtBase {
         config.fingerPrint = queryParam["fp"]
         config.alpn = queryParam["alpn"]
         config.echConfigList = queryParam["ech"]
+        config.pinnedCA256 = queryParam["pcs"]
         config.publicKey = queryParam["pbk"]
         config.shortId = queryParam["sid"]
         config.spiderX = queryParam["spx"]
@@ -99,15 +100,16 @@ open class FmtBase {
     fun getQueryDic(config: ProfileItem): HashMap<String, String> {
         val dicQuery = HashMap<String, String>()
         dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.sni?.nullIfBlank()?.let { dicQuery["sni"] = it }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.alpn?.nullIfBlank()?.let { dicQuery["alpn"] = it }
-        config.echConfigList.let { if (it.isNotNullEmpty()) dicQuery["ech"] = it.orEmpty() }
+        config.echConfigList?.nullIfBlank()?.let { dicQuery["ech"] = it }
-        config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
+        config.pinnedCA256?.nullIfBlank()?.let { dicQuery["pcs"] = it }
-        config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
+        config.fingerPrint?.nullIfBlank()?.let { dicQuery["fp"] = it }
-        config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
+        config.publicKey?.nullIfBlank()?.let { dicQuery["pbk"] = it }
-        config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
+        config.shortId?.nullIfBlank()?.let { dicQuery["sid"] = it }
-        config.mldsa65Verify.let { if (it.isNotNullEmpty()) dicQuery["pqv"] = it.orEmpty() }
+        config.spiderX?.nullIfBlank()?.let { dicQuery["spx"] = it }
-        config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }
+        config.mldsa65Verify?.nullIfBlank()?.let { dicQuery["pqv"] = it }
+        config.flow?.nullIfBlank()?.let { dicQuery["flow"] = it }
         // Add two keys for compatibility: "insecure" and "allowInsecure"
         if (config.security == AppConfig.TLS) {
             val insecureFlag = if (config.insecure == true) "1" else "0"
@@ -121,42 +123,42 @@ open class FmtBase {
         when (networkType) {
             NetworkType.TCP -> {
                 dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
             }
 
             NetworkType.KCP -> {
                 dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
+                config.seed?.nullIfBlank()?.let { dicQuery["seed"] = it }
             }
 
             NetworkType.WS, NetworkType.HTTP_UPGRADE -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
             }
 
             NetworkType.XHTTP -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
-                config.xhttpMode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
+                config.xhttpMode?.nullIfBlank()?.let { dicQuery["mode"] = it }
-                config.xhttpExtra.let { if (it.isNotNullEmpty()) dicQuery["extra"] = it.orEmpty() }
+                config.xhttpExtra?.nullIfBlank()?.let { dicQuery["extra"] = it }
             }
 
             NetworkType.HTTP, NetworkType.H2 -> {
                 dicQuery["type"] = "http"
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
             }
 
 //            NetworkType.QUIC -> {
 //                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-//                config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
+//                config.quicSecurity?.nullIfBlank()?.let { dicQuery["quicSecurity"] = it }
-//                config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
+//                config.quicKey?.nullIfBlank()?.let { dicQuery["key"] = it }
 //            }
 
             NetworkType.GRPC -> {
-                config.mode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
+                config.mode?.nullIfBlank()?.let { dicQuery["mode"] = it }
-                config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
+                config.authority?.nullIfBlank()?.let { dicQuery["authority"] = it }
-                config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
+                config.serviceName?.nullIfBlank()?.let { dicQuery["serviceName"] = it }
             }
 
             else -> {}

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt

@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.isNotNullEmpty

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt

@@ -1,14 +1,14 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.FinalMaskBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.UdpMasksBean.UdpMasksSettingsBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
@@ -26,7 +26,7 @@ object Hysteria2Fmt : FmtBase() {
         val config = ProfileItem.create(EConfigType.HYSTERIA2)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
@@ -61,8 +61,8 @@ object Hysteria2Fmt : FmtBase() {
         val dicQuery = HashMap<String, String>()
 
         config.security.let { if (it != null) dicQuery["security"] = it }
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.sni?.nullIfBlank()?.let { dicQuery["sni"] = it }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.alpn?.nullIfBlank()?.let { dicQuery["alpn"] = it }
         config.insecure.let { dicQuery["insecure"] = if (it == true) "1" else "0" }
 
         if (config.obfsPassword.isNotNullEmpty()) {
@@ -108,11 +108,13 @@ object Hysteria2Fmt : FmtBase() {
         }
 
         if (profileItem.obfsPassword.isNotNullEmpty()) {
-            outboundBean.streamSettings?.udpmasks = mutableListOf(
+            outboundBean.streamSettings?.finalmask = FinalMaskBean(
-                StreamSettingsBean.UdpMasksBean(
+                udp = listOf(
-                    type = "salamander",
+                    FinalMaskBean.MaskBean(
-                    settings = UdpMasksSettingsBean(
+                        type = "salamander",
-                        password = profileItem.obfsPassword
+                        settings = FinalMaskBean.MaskBean.MaskSettingsBean(
+                            password = profileItem.obfsPassword
+                        )
                     )
                 )
             )

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt

@@ -2,8 +2,8 @@ package com.v2ray.ang.fmt
 
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
@@ -36,7 +36,7 @@ object ShadowsocksFmt : FmtBase() {
         if (uri.port <= 0) return null
         if (uri.userInfo.isNullOrEmpty()) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
@@ -83,7 +83,7 @@ object ShadowsocksFmt : FmtBase() {
         if (indexSplit > 0) {
             try {
                 config.remarks =
-                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
+                    Utils.decodeURIComponent(result.substring(indexSplit + 1, result.length))
             } catch (e: Exception) {
                 Log.e(AppConfig.TAG, "Failed to decode remarks in SS legacy URL", e)
             }

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt

@@ -1,6 +1,6 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
@@ -23,7 +23,7 @@ object SocksFmt : FmtBase() {
         if (uri.idnHost.isEmpty()) return null
         if (uri.port <= 0) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
@@ -23,7 +23,7 @@ object TrojanFmt : FmtBase() {
         val config = ProfileItem.create(EConfigType.TROJAN)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt

@@ -1,7 +1,7 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
@@ -26,7 +26,7 @@ object VlessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt

@@ -3,13 +3,13 @@ package com.v2ray.ang.fmt
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.JsonUtil
@@ -132,8 +132,8 @@ object VmessFmt : FmtBase() {
             else -> {}
         }
 
-        config.host.let { if (it.isNotNullEmpty()) vmessQRCode.host = it.orEmpty() }
+        config.host?.nullIfBlank()?.let { vmessQRCode.host = it }
-        config.path.let { if (it.isNotNullEmpty()) vmessQRCode.path = it.orEmpty() }
+        config.path?.nullIfBlank()?.let { vmessQRCode.path = it }
 
         vmessQRCode.tls = config.security.orEmpty()
         vmessQRCode.sni = config.sni.orEmpty()
@@ -163,7 +163,7 @@ object VmessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt

@@ -2,10 +2,11 @@ package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
@@ -25,14 +26,14 @@ object WireguardFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
         config.secretKey = uri.userInfo.orEmpty()
         config.localAddress = queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.publicKey = queryParam["publickey"].orEmpty()
-        config.preSharedKey = queryParam["presharedkey"]?.takeIf { it.isNotEmpty() }
+        config.preSharedKey = queryParam["presharedkey"]?.nullIfBlank()
         config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
         config.reserved = queryParam["reserved"] ?: "0,0,0"
 
@@ -84,7 +85,7 @@ object WireguardFmt : FmtBase() {
         config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
         config.publicKey = peerParams["publickey"].orEmpty()
-        config.preSharedKey = peerParams["presharedkey"]?.takeIf { it.isNotEmpty() }
+        config.preSharedKey = peerParams["presharedkey"]?.nullIfBlank()
         val endpoint = peerParams["endpoint"].orEmpty()
         val endpointParts = endpoint.split(":", limit = 2)
         if (endpointParts.size == 2) {
@@ -113,7 +114,7 @@ object WireguardFmt : FmtBase() {
             wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
             wireguard.peers?.firstOrNull()?.let { peer ->
                 peer.publicKey = profileItem.publicKey.orEmpty()
-                peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
+                peer.preSharedKey = profileItem.preSharedKey?.nullIfBlank()
                 peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
             }
             wireguard.mtu = profileItem.mtu

V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt

@@ -7,8 +7,9 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
@@ -270,13 +271,14 @@ object AngConfigManager {
         ) {
             try {
                 val serverList: Array<Any> =
-                    JsonUtil.fromJson(server, Array<Any>::class.java)?: arrayOf()
+                    JsonUtil.fromJson(server, Array<Any>::class.java) ?: arrayOf()
 
                 if (serverList.isNotEmpty()) {
                     var count = 0
                     for (srv in serverList.reversed()) {
                         val config = CustomFmt.parse(JsonUtil.toJson(srv)) ?: continue
                         config.subscriptionId = subid
+                        config.description = generateDescription(config)
                         val key = MmkvManager.encodeServerConfig("", config)
                         MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv) ?: "")
                         count += 1
@@ -291,6 +293,7 @@ object AngConfigManager {
                 // For compatibility
                 val config = CustomFmt.parse(server) ?: return 0
                 config.subscriptionId = subid
+                config.description = generateDescription(config)
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -301,6 +304,7 @@ object AngConfigManager {
         } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
             try {
                 val config = WireguardFmt.parseWireguardConfFile(server) ?: return R.string.toast_incorrect_protocol
+                config.description = generateDescription(config)
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -362,6 +366,7 @@ object AngConfigManager {
             }
 
             config.subscriptionId = subid
+            config.description = generateDescription(config)
             val guid = MmkvManager.encodeServerConfig("", config)
             if (removedSelectedServer != null &&
                 config.server == removedSelectedServer.server && config.serverPort == removedSelectedServer.serverPort
@@ -399,28 +404,28 @@ object AngConfigManager {
      * @param it The subscription item.
      * @return The number of configurations updated.
      */
-    fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
+    fun updateConfigViaSub(it: SubscriptionCache): Int {
         try {
-            if (TextUtils.isEmpty(it.first)
+            if (TextUtils.isEmpty(it.guid)
-                || TextUtils.isEmpty(it.second.remarks)
+                || TextUtils.isEmpty(it.subscription.remarks)
-                || TextUtils.isEmpty(it.second.url)
+                || TextUtils.isEmpty(it.subscription.url)
             ) {
                 return 0
             }
-            if (!it.second.enabled) {
+            if (!it.subscription.enabled) {
                 return 0
             }
-            val url = HttpUtil.toIdnUrl(it.second.url)
+            val url = HttpUtil.toIdnUrl(it.subscription.url)
             if (!Utils.isValidUrl(url)) {
                 return 0
             }
-            if (!it.second.allowInsecureUrl) {
+            if (!it.subscription.allowInsecureUrl) {
                 if (!Utils.isValidSubUrl(url)) {
                     return 0
                 }
             }
             Log.i(AppConfig.TAG, url)
-            val userAgent = it.second.userAgent
+            val userAgent = it.subscription.userAgent
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
@@ -440,11 +445,11 @@ object AngConfigManager {
             if (configText.isEmpty()) {
                 return 0
             }
-            val count = parseConfigViaSub(configText, it.first, false)
+            val count = parseConfigViaSub(configText, it.guid, false)
             if (count > 0) {
-                it.second.lastUpdated = System.currentTimeMillis()
+                it.subscription.lastUpdated = System.currentTimeMillis()
-                MmkvManager.encodeSubscription(it.first, it.second)
+                MmkvManager.encodeSubscription(it.guid, it.subscription)
-                Log.i(AppConfig.TAG, "Subscription updated: ${it.second.remarks}, $count configs")
+                Log.i(AppConfig.TAG, "Subscription updated: ${it.subscription.remarks}, $count configs")
             }
             return count
         } catch (e: Exception) {
@@ -481,7 +486,7 @@ object AngConfigManager {
     private fun importUrlAsSubscription(url: String): Int {
         val subscriptions = MmkvManager.decodeSubscriptions()
         subscriptions.forEach {
-            if (it.second.url == url) {
+            if (it.subscription.url == url) {
                 return 0
             }
         }
@@ -492,4 +497,25 @@ object AngConfigManager {
         MmkvManager.encodeSubscription("", subItem)
         return 1
     }
+
+    /** Generates a description for the profile.
+     *
+     * @param profile The profile item.
+     * @return The generated description.
+     */
+    fun generateDescription(profile: ProfileItem): String {
+        // Hide xxx:xxx:***/xxx.xxx.xxx.***
+        val server = profile.server
+        val port = profile.serverPort
+        if (server.isNullOrBlank() && port.isNullOrBlank()) return ""
+
+        val addrPart = server?.let {
+            if (it.contains(":"))
+                it.split(":").take(2).joinToString(":", postfix = ":***")
+            else
+                it.split('.').dropLast(1).joinToString(".", postfix = ".***")
+        } ?: ""
+
+        return "$addrPart : ${port ?: ""}"
+    }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt

@@ -3,10 +3,12 @@ package com.v2ray.ang.handler
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
 import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
+import com.v2ray.ang.dto.AssetUrlCache
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.dto.WebDavConfig
 import com.v2ray.ang.util.JsonUtil
@@ -309,15 +311,15 @@ object MmkvManager {
      *
      * @return The list of subscriptions.
      */
-    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
+    fun decodeSubscriptions(): List<SubscriptionCache> {
         initSubsList()
 
-        val subscriptions = mutableListOf<Pair<String, SubscriptionItem>>()
+        val subscriptions = mutableListOf<SubscriptionCache>()
         decodeSubsList().forEach { key ->
             val json = subStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
                 val item = JsonUtil.fromJson(json, SubscriptionItem::class.java)?: SubscriptionItem()
-                subscriptions.add(Pair(key, item))
+                subscriptions.add(SubscriptionCache(key, item))
             }
         }
         return subscriptions
@@ -397,16 +399,16 @@ object MmkvManager {
      *
      * @return The list of asset URLs.
      */
-    fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
+    fun decodeAssetUrls(): List<AssetUrlCache> {
-        val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
+        val assetUrlItems = mutableListOf<AssetUrlCache>()
         assetStorage.allKeys()?.forEach { key ->
             val json = assetStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
                 val item = JsonUtil.fromJson(json, AssetUrlItem::class.java)?: AssetUrlItem()
-                assetUrlItems.add(Pair(key, item))
+                assetUrlItems.add(AssetUrlCache(key, item))
             }
         }
-        return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
+        return assetUrlItems.sortedBy { it.assetUrl.addedTime }
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt

@@ -11,13 +11,13 @@ import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.VPN
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.Language
+import com.v2ray.ang.enums.Language
 import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.RoutingType
+import com.v2ray.ang.enums.RoutingType
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.VpnInterfaceAddressConfig
+import com.v2ray.ang.enums.VpnInterfaceAddressConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerList
 import com.v2ray.ang.util.JsonUtil

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SubscriptionUpdater.kt

@@ -36,10 +36,10 @@ object SubscriptionUpdater {
         override suspend fun doWork(): Result {
             Log.i(AppConfig.TAG, "subscription automatic update starting")
 
-            val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
+            val subs = MmkvManager.decodeSubscriptions().filter { it.subscription.autoUpdate }
 
             for (sub in subs) {
-                val subItem = sub.second
+                val subItem = sub.subscription
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     notification.setChannelId(AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
@@ -53,7 +53,7 @@ object SubscriptionUpdater {
                 }
                 notificationManager.notify(3, notification.build())
                 Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
-                AngConfigManager.updateConfigViaSub(Pair(sub.first, subItem))
+                AngConfigManager.updateConfigViaSub(sub)
                 notification.setContentText("Updating ${subItem.remarks}")
             }
             notificationManager.cancel(3)

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt

@@ -10,10 +10,10 @@ import android.util.Log
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.service.ServiceControl
+import com.v2ray.ang.contracts.ServiceControl
 import com.v2ray.ang.service.V2RayProxyOnlyService
 import com.v2ray.ang.service.V2RayVpnService
 import com.v2ray.ang.util.MessageUtil
@@ -151,6 +151,7 @@ object V2RayServiceManager {
         }
 
         try {
+            NotificationManager.showNotification(currentConfig)
             coreController.startLoop(result.content, tunFd)
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to start Core loop", e)
@@ -165,7 +166,7 @@ object V2RayServiceManager {
 
         try {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            NotificationManager.showNotification(currentConfig)
+            //NotificationManager.showNotification(currentConfig)
             NotificationManager.startSpeedNotification(currentConfig)
 
         } catch (e: Exception) {

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -6,8 +6,8 @@ import android.util.Log
 import com.google.gson.JsonArray
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.ConfigResult
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
@@ -16,6 +16,7 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.fmt.HttpFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -840,65 +841,93 @@ object V2rayConfigManager {
      * Configures load balancing settings for the V2ray configuration.
      *
      * @param v2rayConfig The V2ray configuration object to be modified with balancing settings
+     * @param config The profile item containing policy group settings
      */
     private fun getBalance(v2rayConfig: V2rayConfig, config: ProfileItem) {
         try {
             v2rayConfig.routing.rules.forEach { rule ->
                 if (rule.outboundTag == "proxy") {
                     rule.outboundTag = null
-                    rule.balancerTag = "proxy-round"
+                    rule.balancerTag = AppConfig.TAG_BALANCER
                 }
             }
 
-            if (config.policyGroupType == "0") {
+            val lstSelector =  listOf("proxy-")
-                val balancer = V2rayConfig.RoutingBean.BalancerBean(
+            when (config.policyGroupType) {
-                    tag = "proxy-round",
+                // Least Ping goto else
-                    selector = listOf("proxy-"),
+                "1" -> {
-                    strategy = V2rayConfig.RoutingBean.StrategyObject(
+                    // Least Load
-                        type = "leastPing"
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "leastLoad"
+                        )
                     )
-                )
+                    v2rayConfig.routing.balancers = listOf(balancer)
-                v2rayConfig.routing.balancers = listOf(balancer)
+                    v2rayConfig.burstObservatory = V2rayConfig.BurstObservatoryObject(
-                v2rayConfig.observatory = V2rayConfig.ObservatoryObject(
+                        subjectSelector = lstSelector,
-                    subjectSelector = listOf("proxy-"),
+                        pingConfig = V2rayConfig.BurstObservatoryObject.PingConfigObject(
-                    probeUrl = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                            destination = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
-                    probeInterval = "3m",
+                            interval = "5m",
-                    enableConcurrency = true
+                            sampling = 2,
-                )
+                            timeout = "30s"
-            } else {
+                        )
-                val balancer = V2rayConfig.RoutingBean.BalancerBean(
-                    tag = "proxy-round",
-                    selector = listOf("proxy-"),
-                    strategy = V2rayConfig.RoutingBean.StrategyObject(
-                        type = "leastLoad"
                     )
-                )
+                }
-                v2rayConfig.routing.balancers = listOf(balancer)
+                "2" -> {
-                v2rayConfig.burstObservatory = V2rayConfig.BurstObservatoryObject(
+                    // Random
-                    subjectSelector = listOf("proxy-"),
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
-                    pingConfig = V2rayConfig.BurstObservatoryObject.PingConfigObject(
+                        tag = AppConfig.TAG_BALANCER,
-                        destination = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                        selector = lstSelector,
-                        interval = "5m",
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
-                        sampling = 2,
+                            type = "random"
-                        timeout = "30s"
+                        )
                     )
-                )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                }
+                "3" -> {
+                    // Round Robin
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "roundRobin"
+                        )
+                    )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                }
+                else -> {
+                    // Default: Least Ping
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "leastPing"
+                        )
+                    )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                    v2rayConfig.observatory = V2rayConfig.ObservatoryObject(
+                        subjectSelector = lstSelector,
+                        probeUrl = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                        probeInterval = "3m",
+                        enableConcurrency = true
+                    )
+                }
             }
 
             if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch") {
                 v2rayConfig.routing.rules.add(
                     RulesBean(
                         ip = arrayListOf("0.0.0.0/0", "::/0"),
-                        balancerTag = "proxy-round",
+                        balancerTag = AppConfig.TAG_BALANCER,
-                        type = "field"
                     )
                 )
             } else {
                 v2rayConfig.routing.rules.add(
                     RulesBean(
                         network = "tcp,udp",
-                        balancerTag = "proxy-round",
+                        balancerTag = AppConfig.TAG_BALANCER,
-                        type = "field"
                     )
                 )
             }
@@ -1154,19 +1183,39 @@ object V2rayConfigManager {
             }
 
             NetworkType.KCP.type -> {
-                val kcpsetting = StreamSettingsBean.KcpSettingsBean()
+                streamSettings.kcpSettings = StreamSettingsBean.KcpSettingsBean()
-                kcpsetting.header.type = headerType ?: "none"
+                val udpMaskList = mutableListOf<StreamSettingsBean.FinalMaskBean.MaskBean>()
+                if (!headerType.isNullOrEmpty() && headerType != "none") {
+                    val kcpHeaderType = when {
+                        headerType == "wechat-video" -> "header-wechat"
+                        else -> "header-$headerType"
+                    }
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = kcpHeaderType,
+                        settings = if (headerType == "dns" && !host.isNullOrEmpty()) {
+                            StreamSettingsBean.FinalMaskBean.MaskBean.MaskSettingsBean(
+                                domain = host
+                            )
+                        } else {
+                            null
+                        }
+                    ))
+                }
                 if (seed.isNullOrEmpty()) {
-                    kcpsetting.seed = null
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = "mkcp-original"
+                    ))
                 } else {
-                    kcpsetting.seed = seed
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = "mkcp-aes128gcm",
+                        settings = StreamSettingsBean.FinalMaskBean.MaskBean.MaskSettingsBean(
+                            password = seed
+                        )
+                    ))
                 }
-                if (host.isNullOrEmpty()) {
+                streamSettings.finalmask = StreamSettingsBean.FinalMaskBean(
-                    kcpsetting.header.domain = null
+                    udp = udpMaskList.toList()
-                } else {
+                )
-                    kcpsetting.header.domain = host
-                }
-                streamSettings.kcpSettings = kcpsetting
             }
 
             NetworkType.WS.type -> {
@@ -1268,28 +1317,21 @@ object V2rayConfigManager {
         } else {
             profileItem.sni
         }
-        val fingerprint = profileItem.fingerPrint
-        val alpns = profileItem.alpn
-        val echConfigList = profileItem.echConfigList
-        val echForceQuery = profileItem.echForceQuery
-        val publicKey = profileItem.publicKey
-        val shortId = profileItem.shortId
-        val spiderX = profileItem.spiderX
-        val mldsa65Verify = profileItem.mldsa65Verify
 
-        streamSettings.security = if (streamSecurity.isEmpty()) null else streamSecurity
+        streamSettings.security = streamSecurity.nullIfBlank()
         if (streamSettings.security == null) return
         val tlsSetting = StreamSettingsBean.TlsSettingsBean(
             allowInsecure = allowInsecure,
-            serverName = if (sni.isNullOrEmpty()) null else sni,
+            serverName = sni.nullIfBlank(),
-            fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
+            fingerprint = profileItem.fingerPrint.nullIfBlank(),
-            alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            alpn =  profileItem.alpn?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }.takeIf { !it.isNullOrEmpty() },
-            echConfigList = if (echConfigList.isNullOrEmpty()) null else echConfigList,
+            echConfigList = profileItem.echConfigList.nullIfBlank(),
-            echForceQuery = if (echForceQuery.isNullOrEmpty()) null else echForceQuery,
+            echForceQuery = profileItem.echForceQuery.nullIfBlank(),
-            publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
+            pinnedPeerCertSha256 = profileItem.pinnedCA256.nullIfBlank(),
-            shortId = if (shortId.isNullOrEmpty()) null else shortId,
+            publicKey = profileItem.publicKey.nullIfBlank(),
-            spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
+            shortId = profileItem.shortId.nullIfBlank(),
-            mldsa65Verify = if (mldsa65Verify.isNullOrEmpty()) null else mldsa65Verify,
+            spiderX = profileItem.spiderX.nullIfBlank(),
+            mldsa65Verify = profileItem.mldsa65Verify.nullIfBlank(),
         )
         if (streamSettings.security == AppConfig.TLS) {
             streamSettings.tlsSettings = tlsSetting

V2rayNG/app/src/main/java/com/v2ray/ang/helper/FileChooserHelper.kt

@@ -0,0 +1,88 @@
+package com.v2ray.ang.helper
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.extension.toast
+
+/**
+ * Helper for choosing and creating files using Android Storage Access Framework.
+ * Supports both file selection (ACTION_GET_CONTENT) and file creation (CreateDocument).
+ */
+class FileChooserHelper(private val activity: AppCompatActivity) {
+    private var fileChooserCallback: ((Uri?) -> Unit)? = null
+    private var documentCreateCallback: ((Uri?) -> Unit)? = null
+
+    private val fileChooserLauncher: ActivityResultLauncher<Intent> =
+        activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            val uri = result.data?.data
+            if (result.resultCode == AppCompatActivity.RESULT_OK && uri != null) {
+                fileChooserCallback?.invoke(uri)
+            } else {
+                fileChooserCallback?.invoke(null)
+            }
+            fileChooserCallback = null
+        }
+
+    private val documentCreateLauncher: ActivityResultLauncher<String> =
+        activity.registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            documentCreateCallback?.invoke(uri)
+            documentCreateCallback = null
+        }
+
+    /**
+     * Launch file chooser with ACTION_GET_CONTENT intent to select an existing file.
+     *
+     * @param mimeType MIME type filter for files
+     * @param onResult Callback invoked with the selected file URI (null if cancelled)
+     */
+    fun launch(
+        mimeType: String = "*/*",
+        onResult: (Uri?) -> Unit
+    ) {
+        fileChooserCallback = onResult
+
+        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            type = mimeType
+            addCategory(Intent.CATEGORY_OPENABLE)
+        }
+
+        try {
+            fileChooserLauncher.launch(
+                Intent.createChooser(intent, activity.getString(R.string.title_file_chooser))
+            )
+        } catch (ex: ActivityNotFoundException) {
+            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
+            activity.toast(R.string.toast_require_file_manager)
+            fileChooserCallback?.invoke(null)
+            fileChooserCallback = null
+        }
+    }
+
+    /**
+     * Launch document creator to create a new file at user-selected location.
+     *
+     * @param fileName Default file name for the new document
+     * @param onResult Callback invoked with the created file URI (null if cancelled)
+     */
+    fun createDocument(
+        fileName: String,
+        onResult: (Uri?) -> Unit
+    ) {
+        documentCreateCallback = onResult
+        try {
+            documentCreateLauncher.launch(fileName)
+        } catch (ex: ActivityNotFoundException) {
+            Log.e(AppConfig.TAG, "Document creator activity not found", ex)
+            activity.toast(R.string.toast_require_file_manager)
+            documentCreateCallback?.invoke(null)
+            documentCreateCallback = null
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/helper/MmkvPreferenceDataStore.kt

@@ -1,7 +1,10 @@
-package com.v2ray.ang.handler
+package com.v2ray.ang.helper
 
 import androidx.preference.PreferenceDataStore
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
+import com.v2ray.ang.handler.SettingsManager
 
 /**
  * PreferenceDataStore implementation that bridges AndroidX Preference framework to MMKV storage.

V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt

@@ -0,0 +1,46 @@
+package com.v2ray.ang.helper
+
+import android.content.pm.PackageManager
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.v2ray.ang.R
+import com.v2ray.ang.enums.PermissionType
+import com.v2ray.ang.extension.toast
+
+/**
+ * Helper for requesting permissions.
+ */
+class PermissionHelper(private val activity: AppCompatActivity) {
+    private var permissionCallback: ((Boolean) -> Unit)? = null
+
+    private val permissionLauncher: ActivityResultLauncher<String> =
+        activity.registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            permissionCallback?.invoke(isGranted)
+            permissionCallback = null
+        }
+
+    /**
+     * Check the permission and request it if not granted.
+     *
+     * @param permissionType the type of permission
+     * @param onGranted called when permission is granted (called immediately if already granted)
+     */
+    fun request(permissionType: PermissionType, onGranted: () -> Unit) {
+        val permission = permissionType.getPermission()
+        if (ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_GRANTED) {
+            onGranted()
+        } else {
+            permissionCallback = { isGranted ->
+                if (isGranted) {
+                    onGranted()
+                } else {
+                    val message = "${activity.getString(R.string.toast_permission_denied)}  ${permissionType.getLabel()}"
+                    activity.toast(message)
+                }
+            }
+            permissionLauncher.launch(permission)
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/helper/QRCodeScannerHelper.kt

@@ -0,0 +1,38 @@
+package com.v2ray.ang.helper
+
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import com.v2ray.ang.ui.ScannerActivity
+
+/**
+ * Helper for scanning QR codes.
+ *
+ * This class encapsulates the logic for launching the QR code scanner activity
+ * and handling the scan result.
+ */
+class QRCodeScannerHelper(private val activity: AppCompatActivity) {
+    private var scanCallback: ((String?) -> Unit)? = null
+
+    private val scanLauncher: ActivityResultLauncher<Intent> =
+        activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == AppCompatActivity.RESULT_OK) {
+                val scanResult = result.data?.getStringExtra("SCAN_RESULT")
+                scanCallback?.invoke(scanResult)
+            } else {
+                scanCallback?.invoke(null)
+            }
+            scanCallback = null
+        }
+
+    /**
+     * Launch the QR code scanner activity.
+     *
+     * @param onResult Callback invoked with the scan result (null if cancelled or failed)
+     */
+    fun launch(onResult: (String?) -> Unit) {
+        scanCallback = onResult
+        scanLauncher.launch(Intent(activity, ScannerActivity::class.java))
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/service/TProxyService.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.contracts.Tun2SocksControl
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
 import java.io.File

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt

@@ -4,6 +4,7 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
+import com.v2ray.ang.contracts.ServiceControl
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt

@@ -18,6 +18,8 @@ import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.contracts.ServiceControl
+import com.v2ray.ang.contracts.Tun2SocksControl
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.NotificationManager
 import com.v2ray.ang.handler.SettingsManager
@@ -76,7 +78,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     override fun onRevoke() {
-        stopV2Ray()
+        stopAllService()
     }
 
 //    override fun onLowMemory() {
@@ -105,11 +107,15 @@ class V2RayVpnService : VpnService(), ServiceControl {
             Log.e(AppConfig.TAG, "Failed to create VPN interface")
             return
         }
-        V2RayServiceManager.startCoreLoop(mInterface)
+        if (!V2RayServiceManager.startCoreLoop(mInterface)) {
+            Log.e(AppConfig.TAG, "Failed to start V2Ray core loop")
+            stopAllService()
+            return
+        }
     }
 
     override fun stopService() {
-        stopV2Ray(true)
+        stopAllService(true)
     }
 
     override fun vpnProtect(socket: Int): Boolean {
@@ -130,10 +136,14 @@ class V2RayVpnService : VpnService(), ServiceControl {
     private fun setupVpnService() {
         val prepare = prepare(this)
         if (prepare != null) {
+            Log.e(AppConfig.TAG, "VPN preparation failed")
+            stopSelf()
             return
         }
 
         if (configureVpnService() != true) {
+            Log.e(AppConfig.TAG, "VPN configuration failed")
+            stopSelf()
             return
         }
 
@@ -170,7 +180,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             return true
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
-            stopV2Ray()
+            stopAllService()
         }
         return false
     }
@@ -311,11 +321,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
         tun2SocksService?.startTun2Socks()
     }
 
-    /**
+    private fun stopAllService(isForced: Boolean = true) {
-     * Stops the V2Ray service.
-     * @param isForced Whether to force stop the service.
-     */
-    private fun stopV2Ray(isForced: Boolean = true) {
 //        val configName = defaultDPreference.getPrefString(PREF_CURR_CONFIG_GUID, "")
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BackupActivity.kt

@@ -1,15 +1,9 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.app.AlertDialog
-import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.lifecycle.lifecycleScope
 import com.tencent.mmkv.MMKV
@@ -20,7 +14,6 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityBackupBinding
 import com.v2ray.ang.databinding.DialogWebdavBinding
 import com.v2ray.ang.dto.WebDavConfig
-import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
@@ -34,50 +27,13 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class BackupActivity : BaseActivity() {
+class BackupActivity : HelperBaseActivity() {
     private val binding by lazy { ActivityBackupBinding.inflate(layoutInflater) }
 
     private val config_backup_options: Array<out String> by lazy {
         resources.getStringArray(R.array.config_backup_options)
     }
 
-    private val requestPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-            if (isGranted) {
-                try {
-                    showFileChooser()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-        }
-
-    private val createBackupFile =
-        registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
-            if (uri != null) {
-                try {
-                    val ret = backupConfigurationToCache()
-                    if (ret.first) {
-                        // Copy the cached zip file to user-selected location
-                        contentResolver.openOutputStream(uri)?.use { output ->
-                            File(ret.second).inputStream().use { input ->
-                                input.copyTo(output)
-                            }
-                        }
-                        // Clean up cache file
-                        File(ret.second).delete()
-                        toastSuccess(R.string.toast_success)
-                    } else {
-                        toastError(R.string.toast_failure)
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to backup configuration", e)
-                    toastError(R.string.toast_failure)
-                }
-            }
-        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -172,42 +128,29 @@ class BackupActivity : BaseActivity() {
     }
 
     private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+        launchFileChooser { uri ->
-            type = "*/*"
+            if (uri == null) {
-            addCategory(Intent.CATEGORY_OPENABLE)
+                return@launchFileChooser
-        }
+            }
-
+            try {
-        try {
+                val targetFile =
-            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
+                    File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
-        } catch (ex: ActivityNotFoundException) {
+                contentResolver.openInputStream(uri).use { input ->
-            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
+                    targetFile.outputStream().use { fileOut ->
-            toast(R.string.toast_require_file_manager)
+                        input?.copyTo(fileOut)
-        }
-    }
-
-    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            val uri = result.data?.data
-            if (result.resultCode == RESULT_OK && uri != null) {
-                try {
-                    val targetFile =
-                        File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
-                    contentResolver.openInputStream(uri).use { input ->
-                        targetFile.outputStream().use { fileOut ->
-                            input?.copyTo(fileOut)
-                        }
                     }
-                    if (restoreConfiguration(targetFile)) {
+                }
-                        toastSuccess(R.string.toast_success)
+                if (restoreConfiguration(targetFile)) {
-                    } else {
+                    toastSuccess(R.string.toast_success)
-                        toastError(R.string.toast_failure)
+                } else {
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Error during file restore", e)
                     toastError(R.string.toast_failure)
                 }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Error during file restore", e)
+                toastError(R.string.toast_failure)
             }
         }
+    }
 
     private fun backupViaLocal() {
         val dateFormatted = SimpleDateFormat(
@@ -215,25 +158,34 @@ class BackupActivity : BaseActivity() {
             Locale.getDefault()
         ).format(System.currentTimeMillis())
         val defaultFileName = "${getString(R.string.app_name)}_${dateFormatted}.zip"
-        createBackupFile.launch(defaultFileName)
+
+        launchCreateDocument(defaultFileName) { uri ->
+            if (uri != null) {
+                try {
+                    val ret = backupConfigurationToCache()
+                    if (ret.first) {
+                        // Copy the cached zip file to user-selected location
+                        contentResolver.openOutputStream(uri)?.use { output ->
+                            File(ret.second).inputStream().use { input ->
+                                input.copyTo(output)
+                            }
+                        }
+                        // Clean up cache file
+                        File(ret.second).delete()
+                        toastSuccess(R.string.toast_success)
+                    } else {
+                        toastError(R.string.toast_failure)
+                    }
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to backup configuration", e)
+                    toastError(R.string.toast_failure)
+                }
+            }
+        }
     }
 
     private fun restoreViaLocal() {
-        val permission =
+        showFileChooser()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Manifest.permission.READ_MEDIA_IMAGES
-            } else {
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            }
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            try {
-                showFileChooser()
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-            }
-        } else {
-            requestPermissionLauncher.launch(permission)
-        }
     }
 
     private fun backupViaWebDav() {

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt

@@ -39,6 +39,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         if (!Utils.getDarkModeStatus(this)) {
             WindowCompat.getInsetsController(window, window.decorView).apply {
@@ -212,5 +213,4 @@ abstract class BaseActivity : AppCompatActivity() {
     protected fun isLoadingVisible(): Boolean {
         return progressBar?.visibility == View.VISIBLE
     }
-
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt

@@ -13,9 +13,10 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.ItemTouchHelper
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.MainAdapterListener
 import com.v2ray.ang.databinding.FragmentGroupServerBinding
 import com.v2ray.ang.databinding.ItemQrcodeBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError

V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt

@@ -0,0 +1,90 @@
+package com.v2ray.ang.ui
+
+import android.net.Uri
+import android.os.Bundle
+import com.v2ray.ang.enums.PermissionType
+import com.v2ray.ang.helper.FileChooserHelper
+import com.v2ray.ang.helper.PermissionHelper
+import com.v2ray.ang.helper.QRCodeScannerHelper
+
+/**
+ * HelperBaseActivity extends BaseActivity and provides additional helpers for
+ * activities that need file chooser, permission requesting, or QR code scanning functionality.
+ *
+ * Activities that don't need these features should extend BaseActivity directly.
+ * Activities that need file selection, permissions, or QR code scanning should extend this class.
+ *
+ * Additional Responsibilities:
+ * - Provide file chooser helpers for selecting and creating files.
+ * - Provide permission request helpers with callbacks.
+ * - Provide QR code scanning helpers with camera permission handling.
+ */
+abstract class HelperBaseActivity : BaseActivity() {
+    private lateinit var fileChooser : FileChooserHelper
+    private lateinit var permissionRequester : PermissionHelper
+    private lateinit var qrCodeScanner : QRCodeScannerHelper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        fileChooser = FileChooserHelper(this)
+        permissionRequester = PermissionHelper(this)
+        qrCodeScanner = QRCodeScannerHelper(this)
+    }
+
+    /**
+     * Check if permission is granted and request it if not.
+     * Convenience method that delegates to permissionRequester.
+     *
+     * @param permissionType The type of permission to check and request
+     * @param onGranted Callback to execute when permission is granted
+     */
+    protected fun checkAndRequestPermission(
+        permissionType: PermissionType,
+        onGranted: () -> Unit
+    ) {
+        permissionRequester.request(permissionType, onGranted)
+    }
+
+    /**
+     * Launch file chooser with ACTION_GET_CONTENT intent.
+     * Convenience method that delegates to fileChooser helper.
+     *
+     * @param mimeType MIME type filter for files
+     * @param onResult Callback invoked with the selected file URI (null if cancelled)
+     */
+    protected fun launchFileChooser(
+        mimeType: String = "*/*",
+        onResult: (Uri?) -> Unit
+    ) {
+        checkAndRequestPermission(PermissionType.READ_STORAGE) {
+            fileChooser.launch(mimeType, onResult)
+        }
+    }
+
+    /**
+     * Launch document creator to create a new file at user-selected location.
+     * Convenience method that delegates to fileChooser helper.
+     * Note: No permission check needed as CreateDocument uses Storage Access Framework.
+     *
+     * @param fileName Default file name for the new document
+     * @param onResult Callback invoked with the created file URI (null if cancelled)
+     */
+    protected fun launchCreateDocument(
+        fileName: String,
+        onResult: (Uri?) -> Unit
+    ) {
+        fileChooser.createDocument(fileName, onResult)
+    }
+
+    /**
+     * Launch QR code scanner with camera permission check.
+     * Convenience method that delegates to qrCodeScanner helper.
+     *
+     * @param onResult Callback invoked with the scan result string (null if cancelled or failed)
+     */
+    protected fun launchQRCodeScanner(onResult: (String?) -> Unit) {
+        checkAndRequestPermission(PermissionType.CAMERA) {
+            qrCodeScanner.launch(onResult)
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt

@@ -1,12 +1,9 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.net.Uri
 import android.net.VpnService
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
@@ -27,7 +24,8 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityMainBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.PermissionType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.handler.AngConfigManager
@@ -42,7 +40,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
+class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelectedListener {
     private val binding by lazy {
         ActivityMainBinding.inflate(layoutInflater)
     }
@@ -65,52 +63,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
     }
 
-    // register activity result for requesting permission
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                when (pendingAction) {
-                    Action.IMPORT_QR_CODE_CONFIG ->
-                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-
-                    Action.READ_CONTENT_FROM_URI ->
-                        chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
-                            type = "*/*"
-                            addCategory(Intent.CATEGORY_OPENABLE)
-                        }, getString(R.string.title_file_chooser)))
-
-                    Action.POST_NOTIFICATIONS -> {}
-                    else -> {}
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-            pendingAction = Action.NONE
-        }
-
-    private var pendingAction: Action = Action.NONE
-
-    enum class Action {
-        NONE,
-        IMPORT_QR_CODE_CONFIG,
-        READ_CONTENT_FROM_URI,
-        POST_NOTIFICATIONS
-    }
-
-    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            readContentFromUri(uri)
-        }
-    }
-
-    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -148,11 +100,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         setupViewModel()
         mainViewModel.reloadServerList()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        checkAndRequestPermission(PermissionType.POST_NOTIFICATIONS) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                pendingAction = Action.POST_NOTIFICATIONS
-                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-            }
         }
     }
 
@@ -416,12 +364,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * import config from qrcode
      */
     private fun importQRcode(): Boolean {
-        val permission = Manifest.permission.CAMERA
+        launchQRCodeScanner { scanResult ->
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            if (scanResult != null) {
-            scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+                importBatchConfig(scanResult)
-        } else {
+            }
-            pendingAction = Action.IMPORT_QR_CODE_CONFIG
-            requestPermissionLauncher.launch(permission)
         }
         return true
     }
@@ -592,21 +538,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * show file chooser
      */
     private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        launchFileChooser { uri ->
-        intent.type = "*/*"
+            if (uri == null) {
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
+                return@launchFileChooser
+            }
 
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            readContentFromUri(uri)
-            Manifest.permission.READ_MEDIA_IMAGES
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            pendingAction = Action.READ_CONTENT_FROM_URI
-            chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } else {
-            requestPermissionLauncher.launch(permission)
         }
     }
 
@@ -614,22 +551,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * read content from uri
      */
     private fun readContentFromUri(uri: Uri) {
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        try {
-            Manifest.permission.READ_MEDIA_IMAGES
+            contentResolver.openInputStream(uri).use { input ->
-        } else {
+                importBatchConfig(input?.bufferedReader()?.readText())
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            try {
-                contentResolver.openInputStream(uri).use { input ->
-                    importBatchConfig(input?.bufferedReader()?.readText())
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to read content from URI", e)
             }
-        } else {
+        } catch (e: Exception) {
-            requestPermissionLauncher.launch(permission)
+            Log.e(AppConfig.TAG, "Failed to read content from URI", e)
         }
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt

@@ -9,10 +9,13 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.MainAdapterListener
 import com.v2ray.ang.databinding.ItemRecyclerFooterBinding
 import com.v2ray.ang.databinding.ItemRecyclerMainBinding
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServersCache
+import com.v2ray.ang.extension.nullIfBlank
+import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
@@ -120,19 +123,7 @@ class MainRecyclerAdapter(
      * @return Formatted address string
      */
     private fun getAddress(profile: ProfileItem): String {
-        // Hide xxx:xxx:***/xxx.xxx.xxx.***
+        return profile.description.nullIfBlank() ?: AngConfigManager.generateDescription(profile)
-        val server = profile.server
-        val port = profile.serverPort
-        if (server.isNullOrBlank() && port.isNullOrBlank()) return ""
-
-        val addrPart = server?.let {
-            if (it.contains(":"))
-                it.split(":").take(2).joinToString(":", postfix = ":***")
-            else
-                it.split('.').dropLast(1).joinToString(".", postfix = ".***")
-        } ?: ""
-
-        return "$addrPart : ${port ?: ""}"
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.lifecycleScope
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingEditBinding
 import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.SettingsManager
@@ -62,14 +63,11 @@ class RoutingEditActivity : BaseActivity() {
         rulesetItem.apply {
             remarks = binding.etRemarks.text.toString()
             locked = binding.chkLocked.isChecked
-            domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() }
+            domain = binding.etDomain.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            ip = binding.etIp.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() }
+            protocol = binding.etProtocol.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            port = binding.etPort.text.toString().nullIfBlank()
-            protocol = binding.etProtocol.text.toString().takeIf { it.isNotEmpty() }
+            network = binding.etNetwork.text.toString().nullIfBlank()
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            port = binding.etPort.text.toString().takeIf { it.isNotEmpty() }
-            network = binding.etNetwork.text.toString().takeIf { it.isNotEmpty() }
             outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
         }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt

@@ -1,13 +1,11 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
@@ -15,8 +13,8 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
-import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
@@ -29,7 +27,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class RoutingSettingActivity : BaseActivity() {
+class RoutingSettingActivity : HelperBaseActivity() {
     private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
     private val ownerActivity: RoutingSettingActivity
         get() = this
@@ -43,16 +41,6 @@ class RoutingSettingActivity : BaseActivity() {
         resources.getStringArray(R.array.preset_rulesets)
     }
 
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         //setContentView(binding.root)
@@ -88,7 +76,7 @@ class RoutingSettingActivity : BaseActivity() {
         R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
         R.id.import_predefined_rulesets -> importPredefined().let { true }
         R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
-        R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true }
+        R.id.import_rulesets_from_qrcode -> importQRcode()
         R.id.export_rulesets_to_clipboard -> export2Clipboard().let { true }
         else -> super.onOptionsItemSelected(item)
     }
@@ -160,6 +148,15 @@ class RoutingSettingActivity : BaseActivity() {
             .show()
     }
 
+    private fun importQRcode(): Boolean {
+        launchQRCodeScanner { scanResult ->
+            if (scanResult != null) {
+                importRulesetsFromQRcode(scanResult)
+            }
+        }
+        return true
+    }
+
     private fun export2Clipboard() {
         val rulesetList = MmkvManager.decodeRoutingRulesets()
         if (rulesetList.isNullOrEmpty()) {
@@ -170,11 +167,6 @@ class RoutingSettingActivity : BaseActivity() {
         }
     }
 
-    private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importRulesetsFromQRcode(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
 
     private fun importRulesetsFromQRcode(qrcode: String?): Boolean {
         AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ItemRecyclerRoutingSettingBinding
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt

@@ -1,27 +1,13 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
 import com.v2ray.ang.R
-import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 
-class ScScannerActivity : BaseActivity() {
+class ScScannerActivity : HelperBaseActivity() {
-
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-            finish()
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -29,24 +15,20 @@ class ScScannerActivity : BaseActivity() {
         importQRcode()
     }
 
-    private fun importQRcode(): Boolean {
+    private fun importQRcode() {
-        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        launchQRCodeScanner { scanResult ->
-        return true
+            if (scanResult != null) {
-    }
+                val (count, countSub) = AngConfigManager.importBatchConfig(scanResult, "", false)
 
-    private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+                if (count + countSub > 0) {
-        if (it.resultCode == RESULT_OK) {
+                    toastSuccess(R.string.toast_success)
-            val scanResult = it.data?.getStringExtra("SCAN_RESULT").orEmpty()
+                } else {
-            val (count, countSub) = AngConfigManager.importBatchConfig(scanResult, "", false)
+                    toastError(R.string.toast_failure)
+                }
 
-            if (count + countSub > 0) {
+                startActivity(Intent(this, MainActivity::class.java))
-                toastSuccess(R.string.toast_success)
-            } else {
-                toastError(R.string.toast_failure)
             }
-
+            finish()
-            startActivity(Intent(this, MainActivity::class.java))
         }
-        finish()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt

@@ -1,16 +1,11 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityNoneBinding
@@ -22,41 +17,10 @@ import io.github.g00fy2.quickie.ScanCustomCode
 import io.github.g00fy2.quickie.config.BarcodeFormat
 import io.github.g00fy2.quickie.config.ScannerConfig
 
-class ScannerActivity : BaseActivity() {
+class ScannerActivity : HelperBaseActivity() {
     private val binding by lazy {  ActivityNoneBinding.inflate(layoutInflater) }
 
     private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
-    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            try {
-                val inputStream = contentResolver.openInputStream(uri)
-                val bitmap = BitmapFactory.decodeStream(inputStream)
-                inputStream?.close()
-
-                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                if (text.isNullOrEmpty()) {
-                    toast(R.string.toast_decoding_failed)
-                } else {
-                    finished(text)
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to decode QR code from file", e)
-                toast(R.string.toast_decoding_failed)
-            }
-        }
-    }
-
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                showFileChooser()
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-        }
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -106,17 +70,7 @@ class ScannerActivity : BaseActivity() {
         }
 
         R.id.select_photo -> {
-            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            showFileChooser()
-                Manifest.permission.READ_MEDIA_IMAGES
-            } else {
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            }
-
-            if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-                showFileChooser()
-            } else {
-                requestPermissionLauncher.launch(permission)
-            }
             true
         }
 
@@ -125,15 +79,25 @@ class ScannerActivity : BaseActivity() {
     }
 
     private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        launchFileChooser("image/*") { uri ->
-        intent.type = "image/*"
+            if (uri == null) {
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
+                return@launchFileChooser
-        //intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+            }
+            try {
+                val inputStream = contentResolver.openInputStream(uri)
+                val bitmap = BitmapFactory.decodeStream(inputStream)
+                inputStream?.close()
 
-        try {
+                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
+                if (text.isNullOrEmpty()) {
-        } catch (ex: android.content.ActivityNotFoundException) {
+                    toast(R.string.toast_decoding_failed)
-            toast(R.string.toast_require_file_manager)
+                } else {
+                    finished(text)
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to decode QR code from file", e)
+                toast(R.string.toast_decoding_failed)
+            }
         }
     }
 }

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

@@ -20,12 +20,13 @@ import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
@@ -137,6 +138,8 @@ class ServerActivity : BaseActivity() {
     private val container_ech_config_list: LinearLayout? by lazy { findViewById(R.id.lay_ech_config_list) }
     private val sp_ech_force_query: Spinner? by lazy { findViewById(R.id.sp_ech_force_query) }
     private val container_ech_force_query: LinearLayout? by lazy { findViewById(R.id.lay_ech_force_query) }
+    private val et_pinned_ca256: EditText? by lazy { findViewById(R.id.et_pinned_ca256) }
+    private val container_pinned_ca256: LinearLayout? by lazy { findViewById(R.id.lay_pinned_ca256) }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -274,7 +277,8 @@ class ServerActivity : BaseActivity() {
                             container_spider_x,
                             container_mldsa65_verify,
                             container_ech_config_list,
-                            container_ech_force_query
+                            container_ech_force_query,
+                            container_pinned_ca256
                         ).forEach { it?.visibility = View.GONE }
                     }
 
@@ -286,7 +290,8 @@ class ServerActivity : BaseActivity() {
                             container_alpn,
                             container_allow_insecure,
                             container_ech_config_list,
-                            container_ech_force_query
+                            container_ech_force_query,
+                            container_pinned_ca256
                         ).forEach { it?.visibility = View.VISIBLE }
                         listOf(
                             container_public_key,
@@ -306,7 +311,8 @@ class ServerActivity : BaseActivity() {
                             container_alpn,
                             container_allow_insecure,
                             container_ech_config_list,
-                            container_ech_force_query
+                            container_ech_force_query,
+                            container_pinned_ca256
                         ).forEach { it?.visibility = View.GONE }
                         listOf(
                             container_public_key,
@@ -394,6 +400,7 @@ class ServerActivity : BaseActivity() {
                     val index = Utils.arrayFind(echForceQuerys, it)
                     index.let { sp_ech_force_query?.setSelection(if (it >= 0) it else 0) }
                 }
+                et_pinned_ca256?.text = Utils.getEditable(config.pinnedCA256)
             } else if (config.security == REALITY) {
                 et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
                 et_short_id?.text = Utils.getEditable(config.shortId.orEmpty())
@@ -488,6 +495,8 @@ class ServerActivity : BaseActivity() {
         saveStreamSettings(config)
         saveTls(config)
 
+        config.description = AngConfigManager.generateDescription(config)
+
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
             config.subscriptionId = subscriptionId.orEmpty()
         }
@@ -566,6 +575,7 @@ class ServerActivity : BaseActivity() {
         val mldsa65Verify = et_mldsa65_verify?.text?.toString()
         val echConfigList = et_ech_config_list?.text?.toString()
         val echForceQueryIndex = sp_ech_force_query?.selectedItemPosition ?: 0
+        val pinnedCA256 = et_pinned_ca256?.text?.toString()
 
         val allowInsecure =
             if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
@@ -585,6 +595,7 @@ class ServerActivity : BaseActivity() {
         config.mldsa65Verify = mldsa65Verify
         config.echConfigList = echConfigList
         config.echForceQuery = echForceQuerys[echForceQueryIndex]
+        config.pinnedCA256 = pinnedCA256
     }
 
     private fun transportTypes(network: String?): Array<out String> {

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt

@@ -11,11 +11,12 @@ import com.blacksquircle.ui.language.json.JsonLanguage
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.fmt.CustomFmt
+import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 
@@ -89,6 +90,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         }
         config.server = profileItem?.server
         config.serverPort = profileItem?.serverPort
+        config.description = AngConfigManager.generateDescription(config)
 
         MmkvManager.encodeServerConfig(editGuid, config)
         MmkvManager.encodeServerRaw(editGuid, binding.editor.text.toString())

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt

@@ -8,10 +8,12 @@ import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerGroupBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 
@@ -66,6 +68,11 @@ class ServerGroupActivity : BaseActivity() {
     private fun clearServer(): Boolean {
         binding.etRemarks.text = null
         binding.etPolicyGroupFilter.text = null
+
+        if (subscriptionId.isNotNullEmpty()) {
+            val pos = subIds.indexOf(subscriptionId).let { if (it >= 0) it else 0 }
+            binding.spPolicyGroupSubId.setSelection(pos)
+        }
         return true
     }
 
@@ -90,6 +97,9 @@ class ServerGroupActivity : BaseActivity() {
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
             config.subscriptionId = subscriptionId.orEmpty()
         }
+
+        config.description =  "${binding.spPolicyGroupType.selectedItem} - ${binding.spPolicyGroupSubId.selectedItem} - ${config.policyGroupFilter}"
+
         MmkvManager.encodeServerConfig(editGuid, config)
         toastSuccess(R.string.toast_success)
         finish()
@@ -119,13 +129,13 @@ class ServerGroupActivity : BaseActivity() {
         val displayList = mutableListOf(getString(R.string.filter_config_all)) //none
         subIds.clear()
         subIds.add("") // index 0 => All
-        subs.forEach { (id, item) ->
+        subs.forEach { sub ->
             val name = when {
-                item.remarks.isNotBlank() -> item.remarks
+                sub.subscription.remarks.isNotBlank() -> sub.subscription.remarks
-                else -> id
+                else -> sub.guid
             }
             displayList.add(name)
-            subIds.add(id)
+            subIds.add(sub.guid)
         }
         val subAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, displayList)
         subAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt

@@ -15,7 +15,7 @@ import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toLongEx
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.MmkvPreferenceDataStore
+import com.v2ray.ang.helper.MmkvPreferenceDataStore
 import com.v2ray.ang.handler.SubscriptionUpdater
 import com.v2ray.ang.util.Utils
 import java.util.concurrent.TimeUnit

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.extension.toast

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
@@ -21,8 +22,8 @@ class SubSettingRecyclerAdapter(
 
     override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
         val subscriptions = viewModel.getAll()
-        val subId = subscriptions[position].first
+        val subId = subscriptions[position].guid
-        val subItem = subscriptions[position].second
+        val subItem = subscriptions[position].subscription
         holder.itemSubSettingBinding.tvName.text = subItem.remarks
         holder.itemSubSettingBinding.tvUrl.text = subItem.url
         holder.itemSubSettingBinding.chkEnable.isChecked = subItem.enabled

V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt

@@ -23,7 +23,8 @@ class TaskerActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = "")
 
         //add def value
         lstData.add("Default")

V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt

@@ -1,22 +1,20 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.provider.OpenableColumns
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ActivityUserAssetBinding
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.toast
@@ -31,7 +29,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
-class UserAssetActivity : BaseActivity() {
+class UserAssetActivity : HelperBaseActivity() {
     private val binding by lazy { ActivityUserAssetBinding.inflate(layoutInflater) }
     private val ownerActivity: UserAssetActivity
         get() = this
@@ -40,39 +38,6 @@ class UserAssetActivity : BaseActivity() {
 
     val extDir by lazy { File(Utils.userAssetPath(this)) }
 
-    private val requestStoragePermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "*/*"
-            intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-            try {
-                chooseFile.launch(
-                    Intent.createChooser(
-                        intent,
-                        getString(R.string.title_file_chooser)
-                    )
-                )
-            } catch (ex: android.content.ActivityNotFoundException) {
-                toast(R.string.toast_require_file_manager)
-            }
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRCodeForAssetURL.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_user_asset_setting))
@@ -125,17 +90,11 @@ class UserAssetActivity : BaseActivity() {
     }
 
     private fun showFileChooser() {
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        launchFileChooser { uri ->
-            Manifest.permission.READ_MEDIA_IMAGES
+            if (uri == null) {
-        } else {
+                return@launchFileChooser
-            Manifest.permission.READ_EXTERNAL_STORAGE
+            }
-        }
-        requestStoragePermissionLauncher.launch(permission)
-    }
 
-    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        val uri = result.data?.data
-        if (result.resultCode == RESULT_OK && uri != null) {
             val assetId = Utils.getUuid()
             runCatching {
                 val assetItem = AssetUrlItem(
@@ -144,7 +103,7 @@ class UserAssetActivity : BaseActivity() {
                 )
 
                 val assetList = MmkvManager.decodeAssetUrls()
-                if (assetList.any { it.second.remarks == assetItem.remarks && it.first != assetId }) {
+                if (assetList.any { it.assetUrl.remarks == assetItem.remarks && it.guid != assetId }) {
                     toast(R.string.msg_remark_is_duplicate)
                 } else {
                     MmkvManager.encodeAsset(assetId, assetItem)
@@ -182,15 +141,14 @@ class UserAssetActivity : BaseActivity() {
     }
 
     private fun importAssetFromQRcode(): Boolean {
-        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        launchQRCodeScanner { scanResult ->
+            if (scanResult != null) {
+                importAsset(scanResult)
+            }
+        }
         return true
     }
 
-    private val scanQRCodeForAssetURL = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importAsset(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
 
     private fun importAsset(url: String?): Boolean {
         try {
@@ -254,10 +212,10 @@ class UserAssetActivity : BaseActivity() {
         }
 
         override fun onRemove(guid: String, position: Int) {
-            val asset = viewModel.getAsset(position)?.takeIf { it.first == guid }
+            val asset = viewModel.getAsset(position)?.takeIf { it.guid == guid }
-                ?: viewModel.getAssets().find { it.first == guid }
+                ?: viewModel.getAssets().find { it.guid == guid }
                 ?: return
-            val file = extDir.listFiles()?.find { it.name == asset.second.remarks }
+            val file = extDir.listFiles()?.find { it.name == asset.assetUrl.remarks }
 
             AlertDialog.Builder(ownerActivity).setMessage(R.string.del_config_comfirm)
                 .setPositiveButton(android.R.string.ok) { _, _ ->

V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetAdapter.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ItemRecyclerUserAssetBinding
 import com.v2ray.ang.extension.toTrafficString
 import com.v2ray.ang.viewmodel.UserAssetViewModel
@@ -34,9 +35,9 @@ class UserAssetAdapter(
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: UserAssetViewHolder, position: Int) {
         val item = viewModel.getAsset(position) ?: return
-        val file = extDir.listFiles()?.find { it.name == item.second.remarks }
+        val file = extDir.listFiles()?.find { it.name == item.assetUrl.remarks }
 
-        holder.itemUserAssetBinding.assetName.text = item.second.remarks
+        holder.itemUserAssetBinding.assetName.text = item.assetUrl.remarks
 
         if (file != null) {
             val dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
@@ -47,10 +48,10 @@ class UserAssetAdapter(
                 holder.itemUserAssetBinding.root.context.getString(R.string.msg_file_not_found)
         }
 
-        if (item.second.locked == true) {
+        if (item.assetUrl.locked == true) {
             holder.itemUserAssetBinding.layoutEdit.visibility = View.GONE
         } else {
-            holder.itemUserAssetBinding.layoutEdit.visibility = if (item.second.url == "file") {
+            holder.itemUserAssetBinding.layoutEdit.visibility = if (item.assetUrl.url == "file") {
                 View.GONE
             } else {
                 View.VISIBLE
@@ -58,10 +59,10 @@ class UserAssetAdapter(
         }
 
         holder.itemUserAssetBinding.layoutEdit.setOnClickListener {
-            adapterListener?.onEdit(item.first, position)
+            adapterListener?.onEdit(item.guid, position)
         }
         holder.itemUserAssetBinding.layoutRemove.setOnClickListener {
-            adapterListener?.onRemove(item.first, position)
+            adapterListener?.onRemove(item.guid, position)
         }
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt

@@ -93,7 +93,7 @@ class UserAssetUrlActivity : BaseActivity() {
 
         // check remarks unique
         val assetList = MmkvManager.decodeAssetUrls()
-        if (assetList.any { it.second.remarks == assetItem.remarks && it.first != assetId }) {
+        if (assetList.any { it.assetUrl.remarks == assetItem.remarks && it.guid != assetId }) {
             toast(R.string.msg_remark_is_duplicate)
             return false
         }

V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt

@@ -328,13 +328,48 @@ object Utils {
      */
     fun urlEncode(url: String): String {
         return try {
-            URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20")
+            URLEncoder.encode(url, Charsets.UTF_8.toString())
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to encode URL", e)
             url
         }
     }
 
+    /**
+     * Decode a "encodeURIComponent" string.
+     *
+     * @param url The "encodeURIComponent" string.
+     * @return The decoded string, or the original string if decoding fails.
+     */
+    fun decodeURIComponent(url: String): String {
+        return try {
+            // Decode strictly according to RFC 3986 / encodeURIComponent semantics.
+            // '+' is a literal plus and MUST NOT be interpreted as space.
+            // Inputs using '+' for spaces are non-conforming and rejected deliberately
+            // to avoid cross-language interoperability issues.
+            URLDecoder.decode(url.replace("+", "%2B"), Charsets.UTF_8.toString())
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to decode encodeURIComponent", e)
+            url
+        }
+    }
+
+    /**
+     * Encode a string to "encodeURIComponent" format.
+     * 
+     * @param url The string to encode.
+     * @return The "encodeURIComponent" encoded string, or the original string if encoding fails.
+     */
+    fun encodeURIComponent(url: String): String {
+        return try {
+            // Replace '+' with '%20' to conform to encodeURIComponent semantics.
+            URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20")
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to encode encodeURIComponent", e)
+            url
+        }
+    }
+
     /**
      * Read text from an asset file.
      *

V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt

@@ -15,8 +15,8 @@ import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.GroupMapItem
-import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServersCache
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
@@ -179,7 +179,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             return AngConfigManager.updateConfigViaSubAll()
         } else {
             val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return 0
-            return AngConfigManager.updateConfigViaSub(Pair(subscriptionId, subItem))
+            return AngConfigManager.updateConfigViaSub(SubscriptionCache(subscriptionId, subItem))
         }
     }
 
@@ -273,7 +273,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun getSubscriptions(context: Context): List<GroupMapItem> {
         val subscriptions = MmkvManager.decodeSubscriptions()
         if (subscriptionId.isNotEmpty()
-            && !subscriptions.map { it.first }.contains(subscriptionId)
+            && !subscriptions.map { it.guid }.contains(subscriptionId)
         ) {
             subscriptionIdChanged("")
         }
@@ -285,8 +285,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 remarks = context.getString(R.string.filter_config_all)
             )
         )
-        subscriptions.forEach { (id, item) ->
+        subscriptions.forEach { sub ->
-            groups.add(GroupMapItem(id = id, remarks = item.remarks))
+            groups.add(GroupMapItem(id = sub.guid, remarks = sub.subscription.remarks))
         }
         return groups
     }
@@ -309,20 +309,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
      * @return The number of removed servers.
      */
     fun removeDuplicateServer(): Int {
-        val serversCacheCopy = mutableListOf<Pair<String, ProfileItem>>()
+        val serversCacheCopy = serversCache.toList().toMutableList()
-        for (it in serversCache) {
-            val config = MmkvManager.decodeServerConfig(it.guid) ?: continue
-            serversCacheCopy.add(Pair(it.guid, config))
-        }
-
         val deleteServer = mutableListOf<String>()
-        serversCacheCopy.forEachIndexed { index, it ->
+        serversCacheCopy.forEachIndexed { index, sc ->
-            val outbound = it.second
+            val profile = sc.profile
-            serversCacheCopy.forEachIndexed { index2, it2 ->
+            serversCacheCopy.forEachIndexed { index2, sc2 ->
                 if (index2 > index) {
-                    val outbound2 = it2.second
+                    val profile2 = sc2.profile
-                    if (outbound.equals(outbound2) && !deleteServer.contains(it2.first)) {
+                    if (profile == profile2 && !deleteServer.contains(sc2.guid)) {
-                        deleteServer.add(it2.first)
+                        deleteServer.add(sc2.guid)
                     }
                 }
             }

V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SubscriptionsViewModel.kt

@@ -1,16 +1,17 @@
 package com.v2ray.ang.viewmodel
 
 import androidx.lifecycle.ViewModel
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsChangeManager
 import com.v2ray.ang.handler.SettingsManager
 
 class SubscriptionsViewModel : ViewModel() {
-    private val subscriptions: MutableList<Pair<String, SubscriptionItem>> =
+    private val subscriptions: MutableList<SubscriptionCache> =
         MmkvManager.decodeSubscriptions().toMutableList()
 
-    fun getAll(): List<Pair<String, SubscriptionItem>> = subscriptions.toList()
+    fun getAll(): List<SubscriptionCache> = subscriptions.toList()
 
     fun reload() {
         subscriptions.clear()
@@ -18,7 +19,7 @@ class SubscriptionsViewModel : ViewModel() {
     }
 
     fun remove(subId: String): Boolean {
-        val changed = subscriptions.removeAll { it.first == subId }
+        val changed = subscriptions.removeAll { it.guid == subId }
         if (changed) {
             MmkvManager.removeSubscription(subId)
             SettingsChangeManager.makeSetupGroupTab()
@@ -27,9 +28,9 @@ class SubscriptionsViewModel : ViewModel() {
     }
 
     fun update(subId: String, item: SubscriptionItem) {
-        val idx = subscriptions.indexOfFirst { it.first == subId }
+        val idx = subscriptions.indexOfFirst { it.guid == subId }
         if (idx >= 0) {
-            subscriptions[idx] = Pair(subId, item)
+            subscriptions[idx] = SubscriptionCache(subId, item)
             MmkvManager.encodeSubscription(subId, item)
         }
     }

V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/UserAssetViewModel.kt

@@ -3,6 +3,7 @@ package com.v2ray.ang.viewmodel
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.AssetUrlCache
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.concatUrl
 import com.v2ray.ang.handler.MmkvManager
@@ -13,15 +14,15 @@ import java.io.FileOutputStream
 import java.net.HttpURLConnection
 
 class UserAssetViewModel : ViewModel() {
-    private val assets = mutableListOf<Pair<String, AssetUrlItem>>()
+    private val assets = mutableListOf<AssetUrlCache>()
     private val builtInGeoFiles = listOf("geosite.dat", "geoip.dat")
 
     val itemCount: Int
         get() = assets.size
 
-    fun getAssets(): List<Pair<String, AssetUrlItem>> = assets.toList()
+    fun getAssets(): List<AssetUrlCache> = assets.toList()
 
-    fun getAsset(position: Int): Pair<String, AssetUrlItem>? = assets.getOrNull(position)
+    fun getAsset(position: Int): AssetUrlCache? = assets.getOrNull(position)
 
     fun reload(geoFilesSource: String) {
         val decoded = MmkvManager.decodeAssetUrls()
@@ -30,17 +31,20 @@ class UserAssetViewModel : ViewModel() {
     }
 
     private fun buildAssetList(
-        decodedAssets: List<Pair<String, AssetUrlItem>>?,
+        decodedAssets: List<AssetUrlCache>?,
         geoFilesSource: String
-    ): List<Pair<String, AssetUrlItem>> {
+    ): List<AssetUrlCache> {
         val savedAssets = decodedAssets ?: emptyList()
         val builtInItems = builtInGeoFiles
-            .filter { geoFile -> savedAssets.none { it.second.remarks == geoFile } }
+            .filter { geoFile -> savedAssets.none { it.assetUrl.remarks == geoFile } }
             .map {
-                Utils.getUuid() to AssetUrlItem(
+                AssetUrlCache(
-                    it,
+                    Utils.getUuid(),
-                    String.format(AppConfig.GITHUB_DOWNLOAD_URL, geoFilesSource).concatUrl(it),
+                    AssetUrlItem(
-                    locked = true
+                        it,
+                        String.format(AppConfig.GITHUB_DOWNLOAD_URL, geoFilesSource).concatUrl(it),
+                        locked = true
+                    )
                 )
             }
         return builtInItems + savedAssets
@@ -51,7 +55,8 @@ class UserAssetViewModel : ViewModel() {
         var successCount = 0
         val failures = mutableListOf<String>()
 
-        snapshot.forEach { (_, item) ->
+        snapshot.forEach { cache ->
+            val item = cache.assetUrl
             val portsToTry = if (httpPort == 0) listOf(0) else listOf(httpPort, 0)
             if (portsToTry.any { tryDownload(item, extDir, it) }) {
                 successCount++

V2rayNG/app/src/main/res/layout/activity_about.xml

@@ -29,6 +29,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_source_code_24dp" />
 
                 <TextView
@@ -53,6 +54,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/license_24px" />
 
                 <TextView
@@ -77,6 +79,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_feedback_24dp" />
 
                 <TextView
@@ -102,6 +105,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_telegram_24dp" />
 
                 <TextView
@@ -126,6 +130,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_privacy_24dp" />
 
                 <TextView

V2rayNG/app/src/main/res/layout/layout_tls.xml

@@ -158,6 +158,27 @@
             android:entries="@array/ech_force_query_value" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/lay_pinned_ca256"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_pinned_ca256" />
+
+        <EditText
+            android:id="@+id/et_pinned_ca256"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:nextFocusDown="@+id/sp_ech_force_query" />
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/lay_public_key"
         android:layout_width="match_parent"

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

@@ -116,6 +116,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra raw JSON, format: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">فشل نسخ الملف، يرجى استخدام مدير الملفات</string>
@@ -399,6 +400,8 @@
     <string-array name="policy_group_type">
         <item>Least Ping</item>
         <item>Least Load</item>
+        <item>Random</item>
+        <item>Round Robin</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra raw JSON, format: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">ফাইল কপি ব্যর্থ, অনুগ্রহ করে ফাইল ম্যানেজার ব্যবহার করুন</string>
@@ -405,6 +406,8 @@
     <string-array name="policy_group_type">
         <item>Least Ping</item>
         <item>Least Load</item>
+        <item>Random</item>
+        <item>Round Robin</item>
     </string-array>
 
     <string-array name="config_backup_options">

V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml

@@ -15,10 +15,10 @@
     <string name="toast_permission_denied">گرؽڌن موجوز مومکن نؽڌ</string>
     <string name="toast_permission_denied_notification">گرؽڌن موجوز وارسۊوی مومکن نؽڌ</string>
     <string name="notification_action_more">سی گرؽڌن دۉسمندیا بیشتر کیلیک کوݩ</string>
-    <string name="toast_services_start">ر وستن خدمات</string>
+    <string name="toast_services_start">ره وستن خدمات</string>
     <string name="toast_services_stop">واڌاشتن خدمات</string>
-    <string name="toast_services_success">ر وستن خدمات وا مووفقیت ٱنجوم وابی</string>
+    <string name="toast_services_success">ره وستن خدمات وا مووفقیت ٱنجوم وابی</string>
-    <string name="toast_services_failure">ر وستن خدمات وا مووفقیت ٱنجوم نوابی</string>
+    <string name="toast_services_failure">ره وستن خدمات وا مووفقیت ٱنجوم نوابی</string>
 
     <!--ServerActivity-->
     <string name="title_server">فایل کانفیگ</string>
@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra خام JSON، قالوو: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">نومگه کانفیگ Ech</string>
     <string name="server_lab_ech_force_query">پورس وو جۊ اجباری Ech</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">لف گیری فایل ٱنجوم نوابی، ز ی برنومه دؽوۉداری فایل هیاری بگرین</string>
@@ -133,7 +134,7 @@
     <string name="msg_dialog_progress">هونی بار ونی بۊ</string>
     <string name="menu_item_search">پیتینیڌن</string>
     <string name="menu_item_select_all">پسند پوی</string>
-    <string name="menu_item_invert_selection">Invert selection</string>
+    <string name="menu_item_invert_selection">پسند چواسه</string>
     <string name="msg_enter_keywords">کلمه کلیدی را وارد کنید</string>
     <string name="switch_bypass_apps_mode">هالت Bypass</string>
     <string name="menu_item_select_proxy_app">پسند خوتکار پروکسی برنومه</string>
@@ -141,7 +142,7 @@
     <string name="menu_item_export_proxy_app">و در کشیڌن من کلیپ بورد</string>
     <string name="menu_item_import_proxy_app">و من ٱووردن ز کلیپ بورد</string>
     <string name="per_app_proxy_settings">سامووا ب تفکیک برنومه</string>
-    <string name="per_app_proxy_settings_enable">ر وندن ب تفکیک برنومه</string>
+    <string name="per_app_proxy_settings_enable">ره وندن ب تفکیک برنومه</string>
 
 
     <!-- Preferences -->
@@ -151,16 +152,16 @@
     <string name="title_vpn_settings">سامووا VPN</string>
     <string name="title_pref_per_app_proxy">پروکسی و ری برنومه</string>
     <string name="summary_pref_per_app_proxy">پوی وولاتی: برنومه واجۊری بیڌه پروکسی هڌ، منپیز موستقیم بؽ نشووه هڌ. هالت دور زیڌن: برنومه نشووک ناڌه موستقیمن منپیز هڌ، پروکسی نشووک زیڌه نؽڌ. گۊزینه پسند خوتکار برنومه پروکسی من نومگه</string>
-    <string name="title_pref_is_booted">منپیز خوتکار مجال ر ونی</string>
+    <string name="title_pref_is_booted">منپیز خوتکار مجال ره ونی</string>
-    <string name="summary_pref_is_booted">مجال ر وندن، خوساخوس و سرور پسند بیڌه منپیز ابۊ که گاشڌ نا مووفق بۊ.</string>
+    <string name="summary_pref_is_booted">مجال ره وندن، خوساخوس و سرور پسند بیڌه منپیز ابۊ که گاشڌ نا مووفق بۊ.</string>
 
-    <string name="title_pref_auto_remove_invalid_after_test">Auto delete invalid config after testing</string>
+    <string name="title_pref_auto_remove_invalid_after_test">پاک کردن خوتکار کانفیگ نا موئتبر بئڌ آزمایش</string>
-    <string name="summary_pref_auto_remove_invalid_after_test">Test results may not be accurate; deleted config cannot be recovered.</string>
+    <string name="summary_pref_auto_remove_invalid_after_test">نتیجه یل آزمایش گاشڌ دییق نبۊن؛ کانفیگ پاک وابیڌه ن نتری وورگنی.</string>
-    <string name="title_pref_auto_sort_after_test">Auto sort after testing</string>
+    <string name="title_pref_auto_sort_after_test">ترتیب خوتکار بئڌ آزمایش</string>
-    <string name="summary_pref_auto_sort_after_test">Test results may not be accurate;</string>
+    <string name="summary_pref_auto_sort_after_test">نتیجه یل آزمایش گاشڌ دییق نبۊن؛</string>
 
     <string name="title_mux_settings">سامووا Mux</string>
-    <string name="title_pref_mux_enabled">ر وندن Mux</string>
+    <string name="title_pref_mux_enabled">ره وندن Mux</string>
     <string name="summary_pref_mux_enabled">زل تر، ٱما گاشڌ منپیز زی قت بۊ\nمخزن ترافیک TCP وا 8 منپیز پؽش فرز، بارت دؽوۉداری UDP وو QUIC ن ای لم سفارشی کۊنین.</string>
     <string name="title_pref_mux_concurency">منپیزا TCP (تلایه منجا 1-1024)</string>
     <string name="title_pref_mux_xudp_concurency">منپیزا XUDP (تلایه منجا 1-1024)</string>
@@ -171,24 +172,24 @@
         <item>گوم زیڌن</item>
     </string-array>
 
-    <string name="title_pref_speed_enabled">ر وندن نشووݩ داڌن سورعت</string>
+    <string name="title_pref_speed_enabled">ره وندن نشووݩ داڌن سورعت</string>
-    <string name="summary_pref_speed_enabled">نشووݩ داڌن سورعت هیم سکویی من وارسۊویا. نماڌ وارسۊوی و ری و کار گرؽڌن آلشت ابۊ.</string>
+    <string name="summary_pref_speed_enabled">نشووݩ داڌن سورعت هیم سکویی من وارسۊویا. نماڌ وارسۊوی و ری و کار گرؽڌن کانفیگ آلشت ابۊ.</string>
 
-    <string name="title_pref_sniffing_enabled">ر وندن Sniffing</string>
+    <string name="title_pref_sniffing_enabled">ره وندن Sniffing</string>
     <string name="summary_pref_sniffing_enabled">دامنه sniff ن ز کتن امتهووݩ کۊنین (پؽش فرز رۊشن)</string>
-    <string name="title_pref_route_only_enabled">ر وندن routeOnly</string>
+    <string name="title_pref_route_only_enabled">ره وندن routeOnly</string>
     <string name="summary_pref_route_only_enabled">ز نوم دامنه sniffed تینا سی تور جوستن استفاڌه کۊنین وو نشۊوی موورد نزرن و عونوان نشۊوی IP ووردارین.</string>
 
-    <string name="title_pref_local_dns_enabled">ر وندن DNS مهلی</string>
+    <string name="title_pref_local_dns_enabled">ره وندن DNS مهلی</string>
     <string name="summary_pref_local_dns_enabled">درخاستا DNS و هسته و من ایان وو و دست ماژول DNS پردازشت ابۊن (پؽشنهاڌ ابۊ ٱر لنگ تور جوستن سی دور زیڌن نشۊویا LAN وو وولات ٱسلی هڌین فعال بۊ)</string>
 
-    <string name="title_pref_fake_dns_enabled">ر وندن DNS جئلی</string>
+    <string name="title_pref_fake_dns_enabled">ره وندن DNS جئلی</string>
     <string name="summary_pref_fake_dns_enabled">DNS مهلی نشۊویا IP جئلی ن وورگنه (زل تر، ٱما گاشڌ من یقرد ز برنومه یل کار نکونه)</string>
 
     <string name="title_pref_prefer_ipv6">ترجی داڌن IPv6</string>
     <string name="summary_pref_prefer_ipv6">تورا IPv6 ن فعال کۊنین وو نشۊویا IPv6 ن ترجی بڌین</string>
 
-    <string name="title_pref_remote_dns">DNS ز ر دیر (اختیاری) (udp/tcp/https/quic) (اختیاری)</string>
+    <string name="title_pref_remote_dns">DNS ز ره دیر (اختیاری) (udp/tcp/https/quic) (اختیاری)</string>
     <string name="summary_pref_remote_dns">DNS</string>
 
     <string name="title_pref_vpn_dns">VPN DNS (تینا IPv4/v6)</string>
@@ -203,14 +204,14 @@
     <string name="title_pref_dns_hosts">DNS هاست موستقیم (قالوو: دامنه: نشۊوی،...)</string>
     <string name="summary_pref_dns_hosts">دامنه:نشۊوی،...</string>
 
-    <string name="title_pref_delay_test_url">نشۊوی اینترنتی آزمایش تئخیر واقعی </string>
+    <string name="title_pref_delay_test_url">نشۊوی اینترنتی آزمایش تئخیر واقعی</string>
     <string name="summary_pref_delay_test_url">نشۊوی اینترنتی</string>
 
     <string name="title_pref_ip_api_url">نشۊوی اینترنتی آزمایش دووسمندیا منپیز هیم سکویی</string>
     <string name="summary_pref_ip_api_url">نشۊوی اینترنتی</string>
 
     <string name="title_pref_proxy_sharing_enabled">هشتن منپیزا ز شبکه مهلی</string>
-    <string name="summary_pref_proxy_sharing_enabled">پوی دسگایل ترن وا نشۊوی IP ایسا، ز ر socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز غیر موجاز جلو گری بۊ.</string>
+    <string name="summary_pref_proxy_sharing_enabled">پوی دسگایل ترن وا نشۊوی IP ایسا، ز ره socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز غیر موجاز جلو گری بۊ.</string>
     <string name="toast_warning_pref_proxysharing_short">منپیزا ز شبکه مهلی ن موجار کۊنین، موتمعن بۊین ک من ی شبکه قابل ائتماڌ هڌین.</string>
 
     <string name="title_pref_allow_insecure">اجازه نا ٱمن</string>
@@ -225,14 +226,14 @@
     <string name="title_pref_confirm_remove">قوۊل کردن پاک کردن کانفیگ</string>
     <string name="summary_pref_confirm_remove">سی پاک وابیڌن فایل کانفیگ نیاز به قوۊل کردن دووارته ز سمت منتور هڌ.</string>
 
-    <string name="title_pref_start_scan_immediate">زی اسکنن ر ون</string>
+    <string name="title_pref_start_scan_immediate">زی اسکنن ره ون</string>
-    <string name="summary_pref_start_scan_immediate">شؽواتگرن سی اسکن، زی مجال ر وندن بۊگۊشین، ٱندی ترین کودن اسکن کۊنین یا شؽواتی ن منه نوار ٱوزار پسند کۊنین.</string>
+    <string name="summary_pref_start_scan_immediate">شؽواتگرن سی اسکن، زی مجال ره وندن بۊگۊشین، ٱندی ترین کودن اسکن کۊنین یا شؽواتی ن منه نوار ٱوزار پسند کۊنین.</string>
 
     <string name="title_pref_append_http_proxy">پروکسی HTTP ن و VPN ازاف کۊنین</string>
     <string name="summary_pref_append_http_proxy">پروکسی HTTP ن موسقیمن ز (مۊرۊرگر/ی قرد ز برنومه یل لادراری بیڌه)، بؽ استفاڌه ز دسگا NIC مجازی (Android 10+) استفاڌه ابۊ.</string>
 
-    <string name="title_pref_double_column_display">ر وندن نشووݩ داڌن دو سۊتۊنی</string>
+    <string name="title_pref_double_column_display">ره وندن نشووݩ داڌن دو سۊتۊنی</string>
-    <string name="summary_pref_double_column_display">نومگه نمایه یل من دو سۊتۊن نشووݩ داڌه ابۊن وو چینۉ ترین موئتوا بیشتری ن سیل کۊنین. سی ر وستن، وا برنومه ن ز نۊ ر ونین.</string>
+    <string name="summary_pref_double_column_display">نومگه نمایه یل من دو سۊتۊن نشووݩ داڌه ابۊن وو چینۉ ترین موئتوا بیشتری ن سیل کۊنین. سی ره وستن، وا برنومه ن ز نۊ ره ونین.</string>
 
     <!-- AboutActivity -->
     <string name="title_pref_feedback">فشناڌن منشڌ</string>
@@ -258,15 +259,15 @@
     <string name="title_language">زووݩ</string>
     <string name="title_ui_settings">سامووا رابت منتوری</string>
     <string name="title_pref_ui_mode_night">سامووا هالت رابت منتوری</string>
-    <string name="title_pref_use_hev_tunnel">Enable Hev TUN Feature</string>
+    <string name="title_pref_use_hev_tunnel">فعال کردن ویژیی Hev TUN</string>
-    <string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use xray-core.</string>
+    <string name="summary_pref_use_hev_tunnel">مجالی ک فعال بۊ، TUN ز hev-socks5-tunnel استفاڌه اکونه؛ ٱر فعال نبۊ، زهمو xray-core استفاڌه اکونه.</string>
     <string name="title_pref_hev_tunnel_loglevel">Hev Tun سئت گوزارشا</string>
-    <string name="title_pref_hev_tunnel_rw_timeout">زمووݩ مندیر بیڌن خوندن/هؽل کردن Hev Tun (سانیه) (پؽش فرز tcp,udp 300،60)</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">زمووݩ مندیر بیڌن خوندن/هؽل کردن Hev Tun (سانیه) (پؽش فرز tcp، udp 300،60)</string>
 
     <string name="title_logcat">گوزارشا</string>
     <string name="logcat_copy">لف گیری</string>
     <string name="logcat_clear">روفتن</string>
-    <string name="title_service_restart">ر وندن دووارته خدمات</string>
+    <string name="title_service_restart">ره وندن دووارته خدمات</string>
     <string name="title_del_all_config">پاک کردن پوی کانفیگا بونکۊ سکویی</string>
     <string name="title_del_duplicate_config">پاک کردن کانفیگا تکراری بونکۊ سکویی</string>
     <string name="title_del_invalid_config">پاک کردن کانفیگا نا موئتبر بونکۊ سکویی</string>
@@ -295,7 +296,7 @@
     <string name="title_import_config_count">و من ٱووردن %d کانفیگ</string>
     <string name="title_export_config_count">و در کشیڌن %d کانفیگ</string>
     <string name="title_update_config_count">ورۊ کردن %d کانفیگ</string>
-    <string name="tasker_start_service">ر وندن خدمات</string>
+    <string name="tasker_start_service">ره وندن خدمات</string>
     <string name="tasker_setting_confirm">قوۊل</string>
 
     <!-- RoutingSettingActivity -->
@@ -330,7 +331,7 @@
     <string name="connection_test_error_status_code">کود ختا: #%d</string>
     <string name="connection_connected">منپیز هڌ، سی واجۊری کیلیک کوݩ</string>
     <string name="connection_not_connected">منپیز نؽڌ</string>
-    <string name="connection_runing_task_left">تعداد وزیفه یل آزمایشی ک ر اۊفتانه: %s</string>
+    <string name="connection_runing_task_left">تعداد وزیفه یل آزمایشی ک ره اۊفتانه: %s</string>
 
     <string name="import_subscription_success">اشتراک وا موفقیت زفت زابی</string>
     <string name="import_subscription_failure">اشتراک زفت نوابی</string>
@@ -338,7 +339,7 @@
     <string name="title_pref_fragment_packets">کتنا فرگمنت</string>
     <string name="title_pref_fragment_length">تۊل کتنا فرگمنت (هدقل-هدکسر)</string>
     <string name="title_pref_fragment_interval">فاسله منجا کتنا فرگمنت (هدقل-هدکسر)</string>
-    <string name="title_pref_fragment_enabled">ر وندن فرگمنت</string>
+    <string name="title_pref_fragment_enabled">ره وندن فرگمنت</string>
 
     <string name="update_check_for_update">واجۊری سی ورۊ رسۊوی</string>
     <string name="update_already_latest_version">سکو نوسخه دیندایی پۊرنیڌه هڌ</string>
@@ -361,7 +362,7 @@
     <string name="title_webdav_url">WebDAV نشۊوی اینترنتی سرور</string>
     <string name="title_webdav_user">نوم منتوری</string>
     <string name="title_webdav_pass">رزم</string>
-    <string name="title_webdav_remote_path">دایرکتوری ر دیر (اختیاری)</string>
+    <string name="title_webdav_remote_path">دایرکتوری ره دیر (اختیاری)</string>
 
     <string-array name="share_method">
         <item>QRcode</item>
@@ -398,7 +399,7 @@
         <item>نومگه شه چین</item>
         <item>جهۊوی (Global)</item>
         <item>نومگه اسبؽڌ ایران</item>
-        <item>Russia Whitelist</item>
+        <item>نومگه اسبؽڌ رۊسیه</item>
     </string-array>
 
     <string-array name="vpn_bypass_lan">
@@ -415,6 +416,8 @@
     <string-array name="policy_group_type">
         <item>کم ترین پینگ</item>
         <item>کم ترین بار(لود)</item>
+        <item>تصادفی</item>
+        <item>گردشی</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">خام JSON XHTTP Extra، قالب: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">لیست کانفیگ Ech</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">کپی فایل انجام نشد، لطفا از برنامه مدیریت فایل استفاده کنید</string>
@@ -414,6 +415,8 @@
     <string-array name="policy_group_type">
         <item>کمترین پینگ</item>
         <item>کمترین بار(لود)</item>
+        <item>تصادفی</item>
+        <item>گردشی</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">Необработанный JSON XHTTP Extra, формат: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Отпечаток сертификата (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">Невозможно скопировать файл, используйте файловый менеджер</string>
@@ -414,6 +415,8 @@
     <string-array name="policy_group_type">
         <item>Наименьшая задержка</item>
         <item>Наименьшая нагрузка</item>
+        <item>Случайно</item>
+        <item>По очереди</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra raw JSON, format: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">Không thể sao chép tệp tin, hãy dùng trình quản lý tệp!</string>
@@ -401,6 +402,8 @@
     <string-array name="policy_group_type">
         <item>Least Ping</item>
         <item>Least Load</item>
+        <item>Random</item>
+        <item>Round Robin</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra 原始 JSON，格式： { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">证书指纹 (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">失败, 请使用文件管理器</string>
@@ -406,6 +407,8 @@
     <string-array name="policy_group_type">
         <item>最低延迟</item>
         <item>最稳定</item>
+        <item>随机选择</item>
+        <item>轮询</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -115,6 +115,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra 原始 JSON，格式： { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">證書指紋 (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">失敗，請使用檔案總管</string>
@@ -406,6 +407,8 @@
     <string-array name="policy_group_type">
         <item>最低延遲</item>
         <item>最少卡頓</item>
+        <item>隨機選擇</item>
+        <item>輪詢</item>
     </string-array>
 
     <string-array name="config_backup_options">

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

@@ -116,6 +116,7 @@
     <string name="server_lab_xhttp_extra">XHTTP Extra raw JSON, format: { XHTTPObject }</string>
     <string name="server_lab_ech_config_list">EchConfigList</string>
     <string name="server_lab_ech_force_query">EchForceQuery</string>
+    <string name="server_lab_pinned_ca256">Certificate fingerprint (SHA-256)</string>
 
     <!-- UserAssetActivity -->
     <string name="toast_asset_copy_failed">File copy failed, please use File Manager</string>
@@ -419,6 +420,8 @@
     <string-array name="policy_group_type">
         <item>Least Ping</item>
         <item>Least Load</item>
+        <item>Random</item>
+        <item>Round Robin</item>
     </string-array>
 
     <string-array name="config_backup_options">

V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt

@@ -2,7 +2,7 @@ package com.v2ray.ang.fmt
 
 import android.util.Base64
 import android.util.Log
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import org.junit.After
 import org.junit.Assert.assertEquals

V2rayNG/gradle.properties

@@ -21,4 +21,14 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-kotlin.incremental=true
+kotlin.incremental=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

V2rayNG/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.2"
+agp = "9.0.0"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
 kotlin = "2.3.0"