up 1.9.8

Some IPs or domains are already included in geoip / geosite

V2rayNG/app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 21
         targetSdk = 34
-        versionCode = 597
-        versionName = "1.9.4"
+        versionCode = 602
+        versionName = "1.9.8"
         multiDexEnabled = true
         splits {
             abi {

V2rayNG/app/src/main/assets/custom_routing_black

@@ -27,13 +27,6 @@
       "geosite:category-ads-all"
     ]
   },
-  {
-    "remarks": "绕过局域网域名",
-    "outboundTag": "direct",
-    "domain": [
-      "geosite:private"
-    ]
-  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -41,6 +34,13 @@
       "geoip:private"
     ]
   },
+  {
+    "remarks": "绕过局域网域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
   {
     "remarks": "代理GFW",
     "outboundTag": "proxy",

V2rayNG/app/src/main/assets/custom_routing_global

@@ -12,13 +12,6 @@
       "geosite:category-ads-all"
     ]
   },
-  {
-    "remarks": "绕过局域网域名",
-    "outboundTag": "direct",
-    "domain": [
-      "geosite:private"
-    ]
-  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -26,6 +19,13 @@
       "geoip:private"
     ]
   },
+  {
+    "remarks": "绕过局域网域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
   {
     "remarks": "最终代理",
     "port": "0-65535",

V2rayNG/app/src/main/assets/custom_routing_white

@@ -1,12 +1,4 @@
 [
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
@@ -20,13 +12,6 @@
       "geosite:category-ads-all"
     ]
   },
-  {
-    "remarks": "绕过局域网域名",
-    "outboundTag": "direct",
-    "domain": [
-      "geosite:private"
-    ]
-  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -35,47 +20,38 @@
     ]
   },
   {
-    "remarks": "绕过中国域名",
+    "remarks": "绕过局域网域名",
     "outboundTag": "direct",
     "domain": [
-      "domain:dns.alidns.com",
-      "domain:doh.pub",
-      "domain:dot.pub",
-      "domain:doh.360.cn",
-      "domain:dot.360.cn",
-      "geosite:cn",
-      "geosite:geolocation-cn"
+      "geosite:private"
     ]
   },
   {
     "remarks": "绕过中国IP",
     "outboundTag": "direct",
     "ip": [
-      "223.5.5.5/32",
-      "223.6.6.6/32",
-      "2400:3200::1/128",
-      "2400:3200:baba::1/128",
-      "119.29.29.29/32",
-      "1.12.12.12/32",
-      "120.53.53.53/32",
-      "2402:4e00::/128",
-      "2402:4e00:1::/128",
-      "180.76.76.76/32",
-      "2400:da00::6666/128",
-      "114.114.114.114/32",
-      "114.114.115.115/32",
-      "180.184.1.1/32",
-      "180.184.2.2/32",
-      "101.226.4.6/32",
-      "218.30.118.6/32",
-      "123.125.81.6/32",
-      "140.207.198.6/32",
       "geoip:cn"
     ]
   },
+  {
+    "remarks": "绕过中国域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:cn",
+      "geosite:geolocation-cn"
+    ]
+  },
+  {
+    "remarks": "Google CN",
+    "outboundTag": "proxy",
+    "domain": [
+      "domain:googleapis.cn",
+      "domain:gstatic.com"
+    ]
+  },
   {
     "remarks": "最终代理",
     "port": "0-65535",
     "outboundTag": "proxy"
   }
-]
+]

V2rayNG/app/src/main/assets/custom_routing_white_iran

@@ -0,0 +1,49 @@
+[
+  {
+    "remarks": "Block udp443",
+    "outboundTag": "block",
+    "port": "443",
+    "network": "udp"
+  },
+  {
+    "remarks": "Block ads and trackers",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "remarks": "Direct LAN IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:private"
+    ]
+  },
+  {
+    "remarks": "Direct LAN domains",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
+  {
+    "remarks": "Bypass Iran domains",
+    "outboundTag": "direct",
+    "domain": [
+      "domain:ir",
+      "geosite:category-ir"
+    ]
+  },
+  {
+    "remarks": "Bypass Iran IP",
+    "outboundTag": "direct",
+    "ip": [
+       "geoip:ir"
+    ]
+  },
+  {
+    "remarks": "Final Agent",
+    "port": "0-65535",
+    "outboundTag": "proxy"
+  }
+]

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

@@ -105,7 +105,10 @@ object AppConfig {
     const val DNS_PROXY = "1.1.1.1"
     const val DNS_DIRECT = "223.5.5.5"
     const val DNS_VPN = "1.1.1.1"
-
+    const val GEOSITE_PRIVATE = "geosite:private"
+    const val GEOSITE_CN = "geosite:cn"
+    const val GEOIP_PRIVATE = "geoip:private"
+    const val GEOIP_CN = "geoip:cn"
 
     /** Ports and addresses for various services. */
     const val PORT_LOCAL_DNS = "10853"
@@ -150,6 +153,7 @@ object AppConfig {
     const val WIREGUARD = "wireguard://"
     const val TUIC = "tuic://"
     const val HYSTERIA2 = "hysteria2://"
+    const val HY2 = "hy2://"
 
     /** Give a good name to this, IDK*/
     const val VPN = "VPN"

V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/ConfigResult.kt

@@ -0,0 +1,9 @@
+package com.v2ray.ang.dto
+
+data class ConfigResult (
+    var status: Boolean,
+    var guid: String? = null,
+    var content: String = "",
+    var domainPort: String? = null,
+)
+

V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/Hysteria2Bean.kt

@@ -4,9 +4,20 @@ data class Hysteria2Bean(
     val server: String?,
     val auth: String?,
     val lazy: Boolean? = true,
-    val socks5: Socks5Bean?,
-    val tls: TlsBean?
+    val obfs: ObfsBean? = null,
+    val socks5: Socks5Bean? = null,
+    val http: Socks5Bean? = null,
+    val tls: TlsBean? = null,
 ) {
+    data class ObfsBean(
+        val type: String?,
+        val salamander: SalamanderBean?
+    ) {
+        data class SalamanderBean(
+            val password: String?,
+        )
+    }
+
     data class Socks5Bean(
         val listen: String?,
     )
@@ -15,4 +26,4 @@ data class Hysteria2Bean(
         val sni: String?,
         val insecure: Boolean?,
     )
-}
+}

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

@@ -104,7 +104,8 @@ data class V2rayConfig(
             var secretKey: String? = null,
             val peers: List<WireGuardBean>? = null,
             var reserved: List<Int>? = null,
-            var mtu: Int? = null
+            var mtu: Int? = null,
+            var obfsPassword: String? = null,
         ) {
 
             data class VnextBean(

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

@@ -5,10 +5,12 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
+import android.os.Bundle
 import android.widget.Toast
 import com.v2ray.ang.AngApplication
 import me.drakeet.support.toast.ToastCompat
 import org.json.JSONObject
+import java.io.Serializable
 import java.net.URI
 import java.net.URLConnection
 
@@ -81,4 +83,14 @@ fun Context.listenForPackageChanges(onetime: Boolean = true, callback: () -> Uni
                 addDataScheme("package")
             })
         }
-    }
+    }
+
+inline fun <reified T : Serializable> Bundle.serializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as? T
+}
+
+inline fun <reified T : Serializable> Intent.serializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/ProcessService.kt

@@ -0,0 +1,45 @@
+package com.v2ray.ang.service
+
+import android.content.Context
+import android.util.Log
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class ProcessService {
+    private val TAG = ANG_PACKAGE
+    private lateinit var process: Process
+
+    fun runProcess(context: Context, cmd: MutableList<String>) {
+        Log.d(TAG, cmd.toString())
+
+        try {
+            val proBuilder = ProcessBuilder(cmd)
+            proBuilder.redirectErrorStream(true)
+            process = proBuilder
+                .directory(context.filesDir)
+                .start()
+
+            CoroutineScope(Dispatchers.IO).launch {
+                Thread.sleep(50L)
+                Log.d(TAG, "runProcess check")
+                process.waitFor()
+                Log.d(TAG, "runProcess exited")
+            }
+            Log.d(TAG, process.toString())
+
+        } catch (e: Exception) {
+            Log.d(TAG, e.toString())
+        }
+    }
+
+    fun stopProcess() {
+        try {
+            Log.d(TAG, "runProcess destroy")
+            process?.destroy()
+        } catch (e: Exception) {
+            Log.d(TAG, e.toString())
+        }
+    }
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/SubscriptionUpdater.kt

@@ -15,6 +15,7 @@ import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
 import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
 import com.v2ray.ang.util.AngConfigManager
+import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.Utils
 
@@ -40,8 +41,8 @@ object SubscriptionUpdater {
 
             val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
 
-            for (i in subs) {
-                val subscription = i.second
+            for (sub in subs) {
+                val subItem = sub.second
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     notification.setChannelId(SUBSCRIPTION_UPDATE_CHANNEL)
@@ -56,11 +57,10 @@ object SubscriptionUpdater {
                 notificationManager.notify(3, notification.build())
                 Log.d(
                     AppConfig.ANG_PACKAGE,
-                    "subscription automatic update: ---${subscription.remarks}"
+                    "subscription automatic update: ---${subItem.remarks}"
                 )
-                val configs = Utils.getUrlContentWithCustomUserAgent(subscription.url)
-                AngConfigManager.importBatchConfig(configs, i.first, false)
-                notification.setContentText("Updating ${subscription.remarks}")
+                updateConfigViaSub(Pair(sub.first, subItem))
+                notification.setContentText("Updating ${subItem.remarks}")
             }
             notificationManager.cancel(3)
             return Result.success()

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt

@@ -164,7 +164,7 @@ object V2RayServiceManager {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
             showNotification()
 
-            PluginUtil.runPlugin(service, config)
+            PluginUtil.runPlugin(service, config, result.domainPort)
         } else {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
             cancelNotification()

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayTestService.kt

@@ -6,9 +6,14 @@ import android.os.IBinder
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_CANCEL
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.util.MessageUtil
+import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
+import com.v2ray.ang.util.V2rayConfigUtil
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -30,10 +35,10 @@ class V2RayTestService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         when (intent?.getIntExtra("key", 0)) {
             MSG_MEASURE_CONFIG -> {
-                val contentPair = intent.getSerializableExtra("content") as Pair<String, String>
+                val guid = intent.serializable<String>("content") ?: ""
                 realTestScope.launch {
-                    val result = SpeedtestUtil.realPing(contentPair.second)
-                    MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(contentPair.first, result))
+                    val result = startRealPing(guid)
+                    MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
                 }
             }
 
@@ -47,4 +52,20 @@ class V2RayTestService : Service() {
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
+
+    private fun startRealPing(guid: String): Long {
+        val retFailure = -1L
+
+        val server = MmkvManager.decodeServerConfig(guid) ?: return retFailure
+        if (server.getProxyOutbound()?.protocol?.equals(EConfigType.HYSTERIA2.name, true) == true) {
+            val delay = PluginUtil.realPingHy2(this, server)
+            return delay
+        } else {
+            val config = V2rayConfigUtil.getV2rayConfig(this, guid)
+            if (!config.status) {
+                return retFailure
+            }
+            return SpeedtestUtil.realPing(config.content)
+        }
+    }
 }

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

@@ -203,7 +203,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     private fun runTun2socks() {
-        val socksPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+        val socksPort = SettingsManager.getSocksPort()
         val cmd = arrayListOf(
             File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
             "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,

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

@@ -199,6 +199,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
     fun startV2Ray() {
         if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+            toast(R.string.title_file_chooser)
             return
         }
         V2RayServiceManager.startV2Ray(this)

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

@@ -10,12 +10,14 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
+
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.SettingsManager
@@ -108,6 +110,44 @@ class RoutingSettingActivity : BaseActivity() {
             true
         }
 
+        R.id.import_rulesets_from_clipboard -> {
+            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    try {
+                        val clipboard = Utils.getClipboard(this)
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            val ret = SettingsManager.resetRoutingRulesetsFromClipboard(clipboard)
+                            launch(Dispatchers.Main) {
+                                if (ret) {
+                                    refreshData()
+                                    toast(R.string.toast_success)
+                                } else {
+                                    toast(R.string.toast_failure)
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+                .setNegativeButton(android.R.string.no) { _, _ ->
+                    //do noting
+                }
+                .show()
+            true
+        }
+
+        R.id.export_rulesets_to_clipboard -> {
+            val rulesetList = MmkvManager.decodeRoutingRulesets()
+            if (rulesetList.isNullOrEmpty()) {
+                toast(R.string.toast_failure)
+            } else {
+                Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
+                toast(R.string.toast_success)
+            }
+            true
+        }
+
         else -> super.onOptionsItemSelected(item)
     }
 

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

@@ -36,7 +36,8 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy
             )
         }
 
-        holder.itemRoutingSettingBinding.chkEnable.setOnCheckedChangeListener { _, isChecked ->
+        holder.itemRoutingSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
+            if( !it.isPressed) return@setOnCheckedChangeListener
             ruleset.enabled = isChecked
             SettingsManager.saveRoutingRuleset(position, ruleset)
         }

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

@@ -118,6 +118,7 @@ class ServerActivity : BaseActivity() {
     private val et_reserved3: EditText? by lazy { findViewById(R.id.et_reserved3) }
     private val et_local_address: EditText? by lazy { findViewById(R.id.et_local_address) }
     private val et_local_mtu: EditText? by lazy { findViewById(R.id.et_local_mtu) }
+    private val et_obfs_password: EditText? by lazy { findViewById(R.id.et_obfs_password) }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -292,7 +293,10 @@ class ServerActivity : BaseActivity() {
             } else {
                 et_local_mtu?.text = Utils.getEditable(outbound.settings?.mtu.toString())
             }
+        } else if (config.configType == EConfigType.HYSTERIA2) {
+            et_obfs_password?.text = Utils.getEditable(outbound.settings?.obfsPassword)
         }
+
         val securityEncryptions =
             if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
         val security =
@@ -455,6 +459,9 @@ class ServerActivity : BaseActivity() {
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
             config.subscriptionId = subscriptionId.orEmpty()
         }
+        if (config.configType == EConfigType.HYSTERIA2) {
+            config.outboundBean?.settings?.obfsPassword = et_obfs_password?.text?.toString()
+        }
 
         MmkvManager.encodeServerConfig(editGuid, config)
         toast(R.string.toast_success)

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

@@ -8,13 +8,14 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.blacksquircle.ui.editorkit.utils.EditorTheme
 import com.blacksquircle.ui.language.json.JsonLanguage
-import com.google.gson.Gson
+
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.Utils
 import me.drakeet.support.toast.ToastCompat
@@ -78,7 +79,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         }
 
         val v2rayConfig = try {
-            Gson().fromJson(binding.editor.text.toString(), V2rayConfig::class.java)
+            JsonUtil.fromJson(binding.editor.text.toString(), V2rayConfig::class.java)
         } catch (e: Exception) {
             e.printStackTrace()
             ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()

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

@@ -44,7 +44,8 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
             )
         }
 
-        holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { _, isChecked ->
+        holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
+            if( !it.isPressed) return@setOnCheckedChangeListener
             subItem.enabled = isChecked
             MmkvManager.encodeSubscription(subId, subItem)
 

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

@@ -31,6 +31,7 @@ import com.v2ray.ang.extension.toTrafficString
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -176,7 +177,7 @@ class UserAssetActivity : BaseActivity() {
             .show()
         toast(R.string.msg_downloading_content)
 
-        val httpPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+        val httpPort = SettingsManager.getHttpPort()
         var assets = MmkvManager.decodeAssetUrls()
         assets = addBuiltInGeoItems(assets)
 

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

@@ -4,16 +4,16 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.*
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.fmt.Hysteria2Fmt
 import com.v2ray.ang.util.fmt.ShadowsocksFmt
 import com.v2ray.ang.util.fmt.SocksFmt
@@ -52,7 +52,7 @@ object AngConfigManager {
                 VlessFmt.parse(str)
             } else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
                 WireguardFmt.parse(str)
-            } else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme)) {
+            } else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme) || str.startsWith(HY2)) {
                 Hysteria2Fmt.parse(str)
             } else {
                 null
@@ -278,34 +278,21 @@ object AngConfigManager {
             && server.contains("routing")
         ) {
             try {
-                //val gson = GsonBuilder().setPrettyPrinting().create()
-                val gson = GsonBuilder()
-                    .setPrettyPrinting()
-                    .disableHtmlEscaping()
-                    .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
-                        object : TypeToken<Double>() {}.type,
-                        JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? ->
-                            JsonPrimitive(
-                                src?.toInt()
-                            )
-                        }
-                    )
-                    .create()
                 val serverList: Array<Any> =
-                    Gson().fromJson(server, Array<Any>::class.java)
+                    JsonUtil.fromJson(server, Array<Any>::class.java)
 
                 if (serverList.isNotEmpty()) {
                     var count = 0
                     for (srv in serverList.reversed()) {
                         val config = ServerConfig.create(EConfigType.CUSTOM)
                         config.fullConfig =
-                            Gson().fromJson(Gson().toJson(srv), V2rayConfig::class.java)
+                            JsonUtil.fromJson(JsonUtil.toJson(srv), V2rayConfig::class.java)
                         config.remarks = config.fullConfig?.remarks
                             ?: ("%04d-".format(count + 1) + System.currentTimeMillis()
                                 .toString())
                         config.subscriptionId = subid
                         val key = MmkvManager.encodeServerConfig("", config)
-                        MmkvManager.encodeServerRaw(key, gson.toJson(srv))
+                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv))
                         count += 1
                     }
                     return count
@@ -318,7 +305,7 @@ object AngConfigManager {
                 // For compatibility
                 val config = ServerConfig.create(EConfigType.CUSTOM)
                 config.subscriptionId = subid
-                config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
+                config.fullConfig = JsonUtil.fromJson(server, V2rayConfig::class.java)
                 config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
@@ -373,19 +360,17 @@ object AngConfigManager {
                 return 0
             }
             Log.d(AppConfig.ANG_PACKAGE, url)
+
             var configText = try {
-                Utils.getUrlContentWithCustomUserAgent(url)
+                val httpPort = SettingsManager.getHttpPort()
+                Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
             } catch (e: Exception) {
                 e.printStackTrace()
                 ""
             }
             if (configText.isEmpty()) {
                 configText = try {
-                    val httpPort = Utils.parseInt(
-                        settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT),
-                        AppConfig.PORT_HTTP.toInt()
-                    )
-                    Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
+                    Utils.getUrlContentWithCustomUserAgent(url)
                 } catch (e: Exception) {
                     e.printStackTrace()
                     ""

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

@@ -0,0 +1,37 @@
+package com.v2ray.ang.util
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import com.google.gson.reflect.TypeToken
+import java.lang.reflect.Type
+
+object JsonUtil {
+    private var gson = Gson()
+
+    fun toJson(src: Any?): String {
+        return gson.toJson(src)
+    }
+
+    fun <T> fromJson(json: String, cls: Class<T>): T {
+        return gson.fromJson(json, cls)
+    }
+
+    fun toJsonPretty(src: Any?): String {
+        val gsonPre = GsonBuilder()
+            .setPrettyPrinting()
+            .disableHtmlEscaping()
+            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
+                object : TypeToken<Double>() {}.type,
+                JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? ->
+                    JsonPrimitive(
+                        src?.toInt()
+                    )
+                }
+            )
+            .create()
+        return gsonPre.toJson(src)
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.v2ray.ang.util
 
-import com.google.gson.Gson
+
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
 import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
@@ -49,7 +49,7 @@ object MmkvManager {
     }
 
     fun encodeServerList(serverList: MutableList<String>) {
-        mainStorage.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
+        mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
     }
 
     fun decodeServerList(): MutableList<String> {
@@ -57,7 +57,7 @@ object MmkvManager {
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            Gson().fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
         }
     }
 
@@ -69,7 +69,7 @@ object MmkvManager {
         if (json.isNullOrBlank()) {
             return null
         }
-        return Gson().fromJson(json, ServerConfig::class.java)
+        return JsonUtil.fromJson(json, ServerConfig::class.java)
     }
 
     fun decodeProfileConfig(guid: String): ProfileItem? {
@@ -80,12 +80,12 @@ object MmkvManager {
         if (json.isNullOrBlank()) {
             return null
         }
-        return Gson().fromJson(json, ProfileItem::class.java)
+        return JsonUtil.fromJson(json, ProfileItem::class.java)
     }
 
     fun encodeServerConfig(guid: String, config: ServerConfig): String {
         val key = guid.ifBlank { Utils.getUuid() }
-        serverStorage.encode(key, Gson().toJson(config))
+        serverStorage.encode(key, JsonUtil.toJson(config))
         val serverList = decodeServerList()
         if (!serverList.contains(key)) {
             serverList.add(0, key)
@@ -101,7 +101,7 @@ object MmkvManager {
             server = config.getProxyOutbound()?.getServerAddress(),
             serverPort = config.getProxyOutbound()?.getServerPort(),
         )
-        profileStorage.encode(key, Gson().toJson(profile))
+        profileStorage.encode(key, JsonUtil.toJson(profile))
         return key
     }
 
@@ -141,7 +141,7 @@ object MmkvManager {
         if (json.isNullOrBlank()) {
             return null
         }
-        return Gson().fromJson(json, ServerAffiliationInfo::class.java)
+        return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
     }
 
     fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
@@ -150,14 +150,14 @@ object MmkvManager {
         }
         val aff = decodeServerAffiliationInfo(guid) ?: ServerAffiliationInfo()
         aff.testDelayMillis = testResult
-        serverAffStorage.encode(guid, Gson().toJson(aff))
+        serverAffStorage.encode(guid, JsonUtil.toJson(aff))
     }
 
     fun clearAllTestDelayResults(keys: List<String>?) {
         keys?.forEach { key ->
             decodeServerAffiliationInfo(key)?.let { aff ->
                 aff.testDelayMillis = 0
-                serverAffStorage.encode(key, Gson().toJson(aff))
+                serverAffStorage.encode(key, JsonUtil.toJson(aff))
             }
         }
     }
@@ -217,7 +217,7 @@ object MmkvManager {
         decodeSubsList().forEach { key ->
             val json = subStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                subscriptions.add(Pair(key, Gson().fromJson(json, SubscriptionItem::class.java)))
+                subscriptions.add(Pair(key, JsonUtil.fromJson(json, SubscriptionItem::class.java)))
             }
         }
         return subscriptions
@@ -234,7 +234,7 @@ object MmkvManager {
 
     fun encodeSubscription(guid: String, subItem: SubscriptionItem) {
         val key = guid.ifBlank { Utils.getUuid() }
-        subStorage.encode(key, Gson().toJson(subItem))
+        subStorage.encode(key, JsonUtil.toJson(subItem))
 
         val subsList = decodeSubsList()
         if (!subsList.contains(key)) {
@@ -245,11 +245,11 @@ object MmkvManager {
 
     fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
         val json = subStorage.decodeString(subscriptionId) ?: return null
-        return Gson().fromJson(json, SubscriptionItem::class.java)
+        return JsonUtil.fromJson(json, SubscriptionItem::class.java)
     }
 
     fun encodeSubsList(subsList: MutableList<String>) {
-        mainStorage.encode(KEY_SUB_IDS, Gson().toJson(subsList))
+        mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList))
     }
 
     fun decodeSubsList(): MutableList<String> {
@@ -257,7 +257,7 @@ object MmkvManager {
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            Gson().fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
         }
     }
 
@@ -270,7 +270,7 @@ object MmkvManager {
         assetStorage.allKeys()?.forEach { key ->
             val json = assetStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                assetUrlItems.add(Pair(key, Gson().fromJson(json, AssetUrlItem::class.java)))
+                assetUrlItems.add(Pair(key, JsonUtil.fromJson(json, AssetUrlItem::class.java)))
             }
         }
         return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
@@ -282,12 +282,12 @@ object MmkvManager {
 
     fun encodeAsset(assetid: String, assetItem: AssetUrlItem) {
         val key = assetid.ifBlank { Utils.getUuid() }
-        assetStorage.encode(key, Gson().toJson(assetItem))
+        assetStorage.encode(key, JsonUtil.toJson(assetItem))
     }
 
     fun decodeAsset(assetid: String): AssetUrlItem? {
         val json = assetStorage.decodeString(assetid) ?: return null
-        return Gson().fromJson(json, AssetUrlItem::class.java)
+        return JsonUtil.fromJson(json, AssetUrlItem::class.java)
     }
 
     //endregion
@@ -297,14 +297,14 @@ object MmkvManager {
     fun decodeRoutingRulesets(): MutableList<RulesetItem>? {
         val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET)
         if (ruleset.isNullOrEmpty()) return null
-        return Gson().fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
+        return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
     }
 
     fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
         if (rulesetList.isNullOrEmpty())
             settingsStorage.encode(PREF_ROUTING_RULESET, "")
         else
-            settingsStorage.encode(PREF_ROUTING_RULESET, Gson().toJson(rulesetList))
+            settingsStorage.encode(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
     }
 
     //endregion

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

@@ -3,46 +3,33 @@ package com.v2ray.ang.util
 import android.content.Context
 import android.os.SystemClock
 import android.util.Log
-import com.google.gson.Gson
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.service.ProcessService
 import com.v2ray.ang.util.fmt.Hysteria2Fmt
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import java.io.File
 
 object PluginUtil {
     //private const val HYSTERIA2 = "hysteria2-plugin"
     private const val HYSTERIA2 = "libhysteria2.so"
-    private const val packageName = ANG_PACKAGE
-    private lateinit var process: Process
+    private const val TAG = ANG_PACKAGE
+    private lateinit var procService: ProcessService
 
 //    fun initPlugin(name: String): PluginManager.InitResult {
 //        return PluginManager.init(name)!!
 //    }
 
-    fun runPlugin(context: Context, config: ServerConfig?) {
-        Log.d(packageName, "runPlugin")
+    fun runPlugin(context: Context, config: ServerConfig?, domainPort: String?) {
+        Log.d(TAG, "runPlugin")
 
         val outbound = config?.getProxyOutbound() ?: return
         if (outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)) {
-            Log.d(packageName, "runPlugin $HYSTERIA2")
+            val configFile = genConfigHy2(context, config, domainPort) ?: return
+            val cmd = genCmdHy2(context, configFile)
 
-            val socksPort = 100 + Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
-            val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return
-
-            val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
-            Log.d(packageName, "runPlugin ${configFile.absolutePath}")
-
-            configFile.parentFile?.mkdirs()
-            configFile.writeText(Gson().toJson(hy2Config))
-            Log.d(packageName, Gson().toJson(hy2Config))
-
-            runHy2(context, configFile)
+            procService = ProcessService()
+            procService.runProcess(context, cmd)
         }
     }
 
@@ -50,8 +37,46 @@ object PluginUtil {
         stopHy2()
     }
 
-    private fun runHy2(context: Context, configFile: File) {
-        val cmd = mutableListOf(
+    fun realPingHy2(context: Context, config: ServerConfig?): Long {
+        Log.d(TAG, "realPingHy2")
+        val retFailure = -1L
+
+        val outbound = config?.getProxyOutbound() ?: return retFailure
+        if (outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)) {
+            val socksPort = Utils.findFreePort(listOf(0))
+            val configFile = genConfigHy2(context, config, "0:${socksPort}") ?: return retFailure
+            val cmd = genCmdHy2(context, configFile)
+
+            val proc = ProcessService()
+            proc.runProcess(context, cmd)
+            Thread.sleep(1000L)
+            val delay = SpeedtestUtil.testConnection(context, socksPort)
+            proc.stopProcess()
+
+            return delay.first
+        }
+        return retFailure
+    }
+
+    private fun genConfigHy2(context: Context, config: ServerConfig, domainPort: String?): File? {
+        Log.d(TAG, "runPlugin $HYSTERIA2")
+
+        val socksPort = domainPort?.split(":")?.last()
+            .let { if (it.isNullOrEmpty()) return null else it.toInt() }
+        val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return null
+
+        val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
+        Log.d(TAG, "runPlugin ${configFile.absolutePath}")
+
+        configFile.parentFile?.mkdirs()
+        configFile.writeText(JsonUtil.toJson(hy2Config))
+        Log.d(TAG, JsonUtil.toJson(hy2Config))
+
+        return configFile
+    }
+
+    private fun genCmdHy2(context: Context, configFile: File): MutableList<String> {
+        return mutableListOf(
             File(context.applicationInfo.nativeLibraryDir, HYSTERIA2).absolutePath,
             //initPlugin(HYSTERIA2).path,
             "--disable-update-check",
@@ -61,34 +86,14 @@ object PluginUtil {
             "warn",
             "client"
         )
-        Log.d(packageName, cmd.toString())
-
-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(context.filesDir)
-                .start()
-
-            CoroutineScope(Dispatchers.IO).launch {
-                Thread.sleep(500L)
-                Log.d(packageName, "$HYSTERIA2 check")
-                process.waitFor()
-                Log.d(packageName, "$HYSTERIA2 exited")
-            }
-            Log.d(packageName, process.toString())
-
-        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
-        }
     }
 
     private fun stopHy2() {
         try {
-            Log.d(packageName, "$HYSTERIA2 destroy")
-            process?.destroy()
+            Log.d(TAG, "$HYSTERIA2 destroy")
+            procService?.stopProcess()
         } catch (e: Exception) {
-            Log.d(packageName, e.toString())
+            Log.d(TAG, e.toString())
         }
     }
 }

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

@@ -2,12 +2,18 @@ package com.v2ray.ang.util
 
 import android.content.Context
 import android.text.TextUtils
-import com.google.gson.Gson
+
+import com.v2ray.ang.AppConfig
+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.dto.RulesetItem
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.util.MmkvManager.decodeProfileConfig
 import com.v2ray.ang.util.MmkvManager.decodeServerConfig
 import com.v2ray.ang.util.MmkvManager.decodeServerList
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.Utils.parseInt
 import java.util.Collections
 
 object SettingsManager {
@@ -25,6 +31,7 @@ object SettingsManager {
             0 -> "custom_routing_white"
             1 -> "custom_routing_black"
             2 -> "custom_routing_global"
+            3 -> "custom_routing_white_iran"
             else -> "custom_routing_white"
         }
         val assets = Utils.readTextFromAssets(context, fileName)
@@ -32,10 +39,34 @@ object SettingsManager {
             return null
         }
 
-        return Gson().fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
+        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
     }
 
     fun resetRoutingRulesets(context: Context, index: Int) {
+        val rulesetList = getPresetRoutingRulesets(context, index) ?: return
+        resetRoutingRulesetsCommon(rulesetList)
+    }
+
+    fun resetRoutingRulesetsFromClipboard(content: String?): Boolean {
+        if (content.isNullOrEmpty()) {
+            return false
+        }
+
+        try {
+            val rulesetList = JsonUtil.fromJson(content, Array<RulesetItem>::class.java).toMutableList()
+            if (rulesetList.isNullOrEmpty()) {
+                return false
+            }
+
+            resetRoutingRulesetsCommon(rulesetList)
+            return true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+    }
+
+    private fun resetRoutingRulesetsCommon(rulesetList: MutableList<RulesetItem>) {
         val rulesetNew: MutableList<RulesetItem> = mutableListOf()
         MmkvManager.decodeRoutingRulesets()?.forEach { key ->
             if (key.looked == true) {
@@ -43,7 +74,6 @@ object SettingsManager {
             }
         }
 
-        val rulesetList = getPresetRoutingRulesets(context, index) ?: return
         rulesetNew.addAll(rulesetList)
         MmkvManager.encodeRoutingRulesets(rulesetNew)
     }
@@ -83,7 +113,9 @@ object SettingsManager {
 
     fun routingRulesetsBypassLan(): Boolean {
         val rulesetItems = MmkvManager.decodeRoutingRulesets()
-        val exist = rulesetItems?.any { it.enabled && it.domain?.contains(":private") == true }
+        val exist = rulesetItems?.filter { it.enabled && it.outboundTag == TAG_DIRECT }?.any {
+            it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
+        }
         return exist == true
     }
 
@@ -117,4 +149,12 @@ object SettingsManager {
         return null
     }
 
+    fun getSocksPort(): Int {
+        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+    }
+
+    fun getHttpPort(): Int {
+        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+    }
+
 }

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

@@ -98,9 +98,9 @@ object SpeedtestUtil {
         }
     }
 
-    fun testConnection(context: Context, port: Int): String {
-        // return V2RayVpnService.measureV2rayDelay()
+    fun testConnection(context: Context, port: Int): Pair<Long, String> {
         var result: String
+        var elapsed = -1L
         var conn: HttpURLConnection? = null
 
         try {
@@ -120,7 +120,7 @@ object SpeedtestUtil {
 
             val start = SystemClock.elapsedRealtime()
             val code = conn.responseCode
-            val elapsed = SystemClock.elapsedRealtime() - start
+            elapsed = SystemClock.elapsedRealtime() - start
 
             if (code == 204 || code == 200 && conn.responseLength == 0L) {
                 result = context.getString(R.string.connection_test_available, elapsed)
@@ -134,10 +134,7 @@ object SpeedtestUtil {
             }
         } catch (e: IOException) {
             // network exception
-            Log.d(
-                AppConfig.ANG_PACKAGE,
-                "testConnection IOException: " + Log.getStackTraceString(e)
-            )
+            Log.d(AppConfig.ANG_PACKAGE, "testConnection IOException: " + Log.getStackTraceString(e))
             result = context.getString(R.string.connection_test_error, e.message)
         } catch (e: Exception) {
             // library exception, eg sumsung
@@ -147,7 +144,7 @@ object SpeedtestUtil {
             conn?.disconnect()
         }
 
-        return result
+        return Pair(elapsed, result)
     }
 
     fun getLibVersion(): String {

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

@@ -453,6 +453,17 @@ object Utils {
         }
     }
 
+    fun findFreePort(ports: List<Int>): Int {
+        for (port in ports) {
+            try {
+                return ServerSocket(port).use { it.localPort }
+            } catch (ex: IOException) {
+                continue  // try next port
+            }
+        }
 
+        // if the program gets here, no port in the range was found
+        throw IOException("no free port found")
+    }
 }
 

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

@@ -3,10 +3,13 @@ package com.v2ray.ang.util
 import android.content.Context
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.GEOIP_CN
+import com.v2ray.ang.AppConfig.GEOSITE_CN
 import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.PROTOCOL_FREEDOM
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
@@ -14,6 +17,7 @@ import com.v2ray.ang.AppConfig.TAG_FRAGMENT
 import com.v2ray.ang.AppConfig.TAG_PROXY
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
+import com.v2ray.ang.dto.ConfigResult
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerConfig
@@ -25,34 +29,32 @@ import com.v2ray.ang.util.MmkvManager.settingsStorage
 
 object V2rayConfigUtil {
 
-    data class Result(var status: Boolean, var content: String = "", var domainPort: String? = null)
-
-    fun getV2rayConfig(context: Context, guid: String): Result {
+    fun getV2rayConfig(context: Context, guid: String): ConfigResult {
         try {
-            val config = MmkvManager.decodeServerConfig(guid) ?: return Result(false)
+            val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
             if (config.configType == EConfigType.CUSTOM) {
                 val raw = MmkvManager.decodeServerRaw(guid)
                 val customConfig = if (raw.isNullOrBlank()) {
-                    config.fullConfig?.toPrettyPrinting() ?: return Result(false)
+                    config.fullConfig?.toPrettyPrinting() ?: return ConfigResult(false)
                 } else {
                     raw
                 }
                 val domainPort = config.getProxyOutbound()?.getServerAddressAndPort()
-                return Result(true, customConfig, domainPort)
+                return ConfigResult(true, guid, customConfig, domainPort)
             }
 
             val result = getV2rayNonCustomConfig(context, config)
             //Log.d(ANG_PACKAGE, result.content)
-            Log.d(ANG_PACKAGE, result.domainPort?:"")
+            result.guid = guid
             return result
         } catch (e: Exception) {
             e.printStackTrace()
-            return Result(false)
+            return ConfigResult(false)
         }
     }
 
-    private fun getV2rayNonCustomConfig(context: Context, config: ServerConfig): Result {
-        val result = Result(false)
+    private fun getV2rayNonCustomConfig(context: Context, config: ServerConfig): ConfigResult {
+        val result = ConfigResult(false)
 
         val outbound = config.getProxyOutbound() ?: return result
         val address = outbound.getServerAddress() ?: return result
@@ -68,7 +70,7 @@ object V2rayConfigUtil {
         if (TextUtils.isEmpty(assets)) {
             return result
         }
-        val v2rayConfig = Gson().fromJson(assets, V2rayConfig::class.java) ?: return result
+        val v2rayConfig = JsonUtil.fromJson(assets, V2rayConfig::class.java) ?: return result
         v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL) ?: "warning"
         v2rayConfig.remarks = config.remarks
 
@@ -101,14 +103,8 @@ object V2rayConfigUtil {
 
     private fun inbounds(v2rayConfig: V2rayConfig): Boolean {
         try {
-            val socksPort = Utils.parseInt(
-                settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT),
-                AppConfig.PORT_SOCKS.toInt()
-            )
-            val httpPort = Utils.parseInt(
-                settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT),
-                AppConfig.PORT_HTTP.toInt()
-            )
+            val socksPort = SettingsManager.getSocksPort()
+            val httpPort = SettingsManager.getHttpPort()
 
             v2rayConfig.inbounds.forEach { curInbound ->
                 if (settingsStorage?.decodeBool(AppConfig.PREF_PROXY_SHARING) != true) {
@@ -149,7 +145,7 @@ object V2rayConfigUtil {
 
     private fun outbounds(v2rayConfig: V2rayConfig, outbound: V2rayConfig.OutboundBean, isPlugin: Boolean): Pair<Boolean, String> {
         if (isPlugin) {
-            val socksPort = 100 + Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+            val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
             val outboundNew = V2rayConfig.OutboundBean(
                 mux = null,
                 protocol = EConfigType.SOCKS.name.lowercase(),
@@ -213,7 +209,7 @@ object V2rayConfigUtil {
                 return
             }
 
-            val rule = Gson().fromJson(Gson().toJson(item), RulesBean::class.java) ?: return
+            val rule = JsonUtil.fromJson(JsonUtil.toJson(item), RulesBean::class.java) ?: return
 
             v2rayConfig.routing.rules.add(rule)
 
@@ -229,7 +225,9 @@ object V2rayConfigUtil {
         rulesetItems?.forEach { key ->
             if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
                 key.domain?.forEach {
-                    if (it.startsWith("geosite:") || it.startsWith("domain:")) {
+                    if (it != GEOSITE_PRIVATE
+                        && (it.startsWith("geosite:") || it.startsWith("domain:"))
+                    ) {
                         domain.add(it)
                     }
                 }
@@ -242,7 +240,7 @@ object V2rayConfigUtil {
     private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
         try {
             if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
-                val geositeCn = arrayListOf("geosite:cn")
+                val geositeCn = arrayListOf(GEOSITE_CN)
                 val proxyDomain = userRule2Domain(TAG_PROXY)
                 val directDomain = userRule2Domain(TAG_DIRECT)
                 // fakedns with all domains to make it always top priority
@@ -333,8 +331,8 @@ object V2rayConfigUtil {
             // domestic DNS
             val domesticDns = Utils.getDomesticDnsServers()
             val directDomain = userRule2Domain(TAG_DIRECT)
-            val isCnRoutingMode = directDomain.contains("geosite:cn")
-            val geoipCn = arrayListOf("geoip:cn")
+            val isCnRoutingMode = directDomain.contains(GEOSITE_CN)
+            val geoipCn = arrayListOf(GEOIP_CN)
             if (directDomain.size > 0) {
                 servers.add(
                     V2rayConfig.DnsBean.ServersBean(
@@ -447,7 +445,7 @@ object V2rayConfigUtil {
                 val requestString: String by lazy {
                     """{"version":"1.1","method":"GET","headers":{"User-Agent":["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36","Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}"""
                 }
-                outbound.streamSettings?.tcpSettings?.header?.request = Gson().fromJson(
+                outbound.streamSettings?.tcpSettings?.header?.request = JsonUtil.fromJson(
                     requestString,
                     V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean.RequestBean::class.java
                 )

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

@@ -0,0 +1,104 @@
+package com.v2ray.ang.util.fmt
+
+import android.text.TextUtils
+import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.util.Utils
+
+open class FmtBase {
+    fun toUri(address: String?, port: Int?, userInfo: String?, dicQuery: HashMap<String, String>?, remark: String): String {
+        val query = if (dicQuery != null)
+            ("?" + dicQuery.toList().joinToString(
+                separator = "&",
+                transform = { it.first + "=" + Utils.urlEncode(it.second) }))
+        else ""
+
+        val url = String.format(
+            "%s@%s:%s",
+            Utils.urlEncode(userInfo ?: ""),
+            Utils.getIpv6Address(address),
+            port
+        )
+
+        return "${url}${query}#${Utils.urlEncode(remark)}"
+    }
+
+    fun getStdTransport(outbound: V2rayConfig.OutboundBean, streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean): HashMap<String, String> {
+        val dicQuery = HashMap<String, String>()
+
+        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
+        (streamSetting.tlsSettings
+            ?: streamSetting.realitySettings)?.let { tlsSetting ->
+            if (!TextUtils.isEmpty(tlsSetting.serverName)) {
+                dicQuery["sni"] = tlsSetting.serverName
+            }
+            if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
+                dicQuery["alpn"] =
+                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
+            }
+            if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
+                dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
+            }
+            if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
+                dicQuery["pbk"] = tlsSetting.publicKey.orEmpty()
+            }
+            if (!TextUtils.isEmpty(tlsSetting.shortId)) {
+                dicQuery["sid"] = tlsSetting.shortId.orEmpty()
+            }
+            if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
+                dicQuery["spx"] = tlsSetting.spiderX.orEmpty()
+            }
+        }
+        dicQuery["type"] =
+            streamSetting.network.ifEmpty { V2rayConfig.DEFAULT_NETWORK }
+
+        outbound.getTransportSettingDetails()?.let { transportDetails ->
+            when (streamSetting.network) {
+                "tcp" -> {
+                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
+                    if (!TextUtils.isEmpty(transportDetails[1])) {
+                        dicQuery["host"] = transportDetails[1]
+                    }
+                }
+
+                "kcp" -> {
+                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
+                    if (!TextUtils.isEmpty(transportDetails[2])) {
+                        dicQuery["seed"] = transportDetails[2]
+                    }
+                }
+
+                "ws", "httpupgrade", "splithttp" -> {
+                    if (!TextUtils.isEmpty(transportDetails[1])) {
+                        dicQuery["host"] = transportDetails[1]
+                    }
+                    if (!TextUtils.isEmpty(transportDetails[2])) {
+                        dicQuery["path"] = transportDetails[2]
+                    }
+                }
+
+                "http", "h2" -> {
+                    dicQuery["type"] = "http"
+                    if (!TextUtils.isEmpty(transportDetails[1])) {
+                        dicQuery["host"] = transportDetails[1]
+                    }
+                    if (!TextUtils.isEmpty(transportDetails[2])) {
+                        dicQuery["path"] = transportDetails[2]
+                    }
+                }
+
+                "quic" -> {
+                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
+                    dicQuery["quicSecurity"] = transportDetails[1]
+                    dicQuery["key"] = transportDetails[2]
+                }
+
+                "grpc" -> {
+                    dicQuery["mode"] = transportDetails[0]
+                    dicQuery["authority"] = transportDetails[1]
+                    dicQuery["serviceName"] = transportDetails[2]
+                }
+            }
+        }
+        return dicQuery
+    }
+}

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

@@ -12,7 +12,7 @@ import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object Hysteria2Fmt {
+object Hysteria2Fmt : FmtBase() {
 
     fun parse(str: String): ServerConfig {
         var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
@@ -26,7 +26,7 @@ object Hysteria2Fmt {
 
         config.outboundBean?.streamSettings?.populateTlsSettings(
             V2rayConfig.TLS,
-            if ((queryParam["allowInsecure"].orEmpty()) == "1") true else allowInsecure,
+            if ((queryParam["insecure"].orEmpty()) == "1") true else allowInsecure,
             queryParam["sni"] ?: uri.idnHost,
             null,
             queryParam["alpn"],
@@ -40,6 +40,10 @@ object Hysteria2Fmt {
             server.port = uri.port
             server.password = uri.userInfo
         }
+        if (!queryParam["obfs-password"].isNullOrEmpty()) {
+            config.outboundBean?.settings?.obfsPassword = queryParam["obfs-password"]
+        }
+
         return config
     }
 
@@ -47,7 +51,7 @@ object Hysteria2Fmt {
         val outbound = config.getProxyOutbound() ?: return ""
         val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
+
         val dicQuery = HashMap<String, String>()
         dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
         streamSetting.tlsSettings?.let { tlsSetting ->
@@ -59,29 +63,35 @@ object Hysteria2Fmt {
                 dicQuery["alpn"] = Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
             }
         }
+        if (!outbound.settings?.obfsPassword.isNullOrEmpty()) {
+            dicQuery["obfs"] = "salamander"
+            dicQuery["obfs-password"] = outbound.settings?.obfsPassword ?: ""
+        }
 
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
-
-        val url = String.format(
-            "%s@%s:%s",
-            outbound.getPassword(),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
     }
 
     fun toNativeConfig(config: ServerConfig, socksPort: Int): Hysteria2Bean? {
         val outbound = config.getProxyOutbound() ?: return null
         val tls = outbound.streamSettings?.tlsSettings
+        val obfs = if (outbound.settings?.obfsPassword.isNullOrEmpty()) null else
+            Hysteria2Bean.ObfsBean(
+                type = "salamander",
+                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
+                    password = outbound.settings?.obfsPassword
+                )
+            )
+
         val bean = Hysteria2Bean(
             server = outbound.getServerAddressAndPort(),
             auth = outbound.getPassword(),
+            obfs = obfs,
             socks5 = Hysteria2Bean.Socks5Bean(
                 listen = "$LOOPBACK:${socksPort}",
             ),
+            http = Hysteria2Bean.Socks5Bean(
+                listen = "$LOOPBACK:${socksPort}",
+            ),
             tls = Hysteria2Bean.TlsBean(
                 sni = tls?.serverName ?: outbound.getServerAddress(),
                 insecure = tls?.allowInsecure

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

@@ -8,7 +8,7 @@ import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object ShadowsocksFmt {
+object ShadowsocksFmt : FmtBase() {
     fun parse(str: String): ServerConfig? {
         val config = ServerConfig.create(EConfigType.SHADOWSOCKS)
         if (!tryResolveResolveSip002(str, config)) {
@@ -52,16 +52,10 @@ object ShadowsocksFmt {
 
     fun toUri(config: ServerConfig): String {
         val outbound = config.getProxyOutbound() ?: return ""
-        val remark = "#" + Utils.urlEncode(config.remarks)
-        val pw =
-            Utils.encode("${outbound.getSecurityEncryption()}:${outbound.getPassword()}")
-        val url = String.format(
-            "%s@%s:%s",
-            pw,
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + remark
+        
+        val pw = Utils.encode("${outbound.getSecurityEncryption()}:${outbound.getPassword()}")
+
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), pw, null, config.remarks)
     }
 
     private fun tryResolveResolveSip002(str: String, config: ServerConfig): Boolean {

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

@@ -5,7 +5,7 @@ import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.util.Utils
 
-object SocksFmt {
+object SocksFmt : FmtBase() {
     fun parse(str: String): ServerConfig? {
         val config = ServerConfig.create(EConfigType.SOCKS)
         var result = str.replace(EConfigType.SOCKS.protocolScheme, "")
@@ -52,18 +52,13 @@ object SocksFmt {
 
     fun toUri(config: ServerConfig): String {
         val outbound = config.getProxyOutbound() ?: return ""
-        val remark = "#" + Utils.urlEncode(config.remarks)
+        
         val pw =
             if (outbound.settings?.servers?.get(0)?.users?.get(0)?.user != null)
                 "${outbound.settings?.servers?.get(0)?.users?.get(0)?.user}:${outbound.getPassword()}"
             else
                 ":"
-        val url = String.format(
-            "%s@%s:%s",
-            Utils.encode(pw),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + remark
+
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), pw, null, config.remarks)
     }
 }

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

@@ -10,7 +10,7 @@ import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object TrojanFmt {
+object TrojanFmt : FmtBase() {
 
     fun parse(str: String): ServerConfig {
         var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
@@ -76,98 +76,15 @@ object TrojanFmt {
         val outbound = config.getProxyOutbound() ?: return ""
         val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
-        val dicQuery = HashMap<String, String>()
+        
+        val dicQuery = getStdTransport(outbound, streamSetting)
+
         config.outboundBean?.settings?.servers?.get(0)?.flow?.let {
             if (!TextUtils.isEmpty(it)) {
                 dicQuery["flow"] = it
             }
         }
 
-        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
-        (streamSetting.tlsSettings
-            ?: streamSetting.realitySettings)?.let { tlsSetting ->
-            if (!TextUtils.isEmpty(tlsSetting.serverName)) {
-                dicQuery["sni"] = tlsSetting.serverName
-            }
-            if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
-                dicQuery["alpn"] =
-                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
-                dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
-                dicQuery["pbk"] = tlsSetting.publicKey.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.shortId)) {
-                dicQuery["sid"] = tlsSetting.shortId.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
-                dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX.orEmpty())
-            }
-        }
-        dicQuery["type"] =
-            streamSetting.network.ifEmpty { V2rayConfig.DEFAULT_NETWORK }
-
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            when (streamSetting.network) {
-                "tcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                }
-
-                "kcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["seed"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "ws", "httpupgrade", "splithttp" -> {
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "http", "h2" -> {
-                    dicQuery["type"] = "http"
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "quic" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    dicQuery["quicSecurity"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["key"] = Utils.urlEncode(transportDetails[2])
-                }
-
-                "grpc" -> {
-                    dicQuery["mode"] = transportDetails[0]
-                    dicQuery["authority"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["serviceName"] = Utils.urlEncode(transportDetails[2])
-                }
-            }
-        }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
-
-        val url = String.format(
-            "%s@%s:%s",
-            outbound.getPassword(),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
     }
 }

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

@@ -10,7 +10,7 @@ import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object VlessFmt {
+object VlessFmt : FmtBase() {
 
     fun parse(str: String): ServerConfig? {
         var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
@@ -63,8 +63,9 @@ object VlessFmt {
         val outbound = config.getProxyOutbound() ?: return ""
         val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
-        val dicQuery = HashMap<String, String>()
+        
+        val dicQuery = getStdTransport(outbound, streamSetting)
+
         outbound.settings?.vnext?.get(0)?.users?.get(0)?.flow?.let {
             if (!TextUtils.isEmpty(it)) {
                 dicQuery["flow"] = it
@@ -74,91 +75,6 @@ object VlessFmt {
             if (outbound.getSecurityEncryption().isNullOrEmpty()) "none"
             else outbound.getSecurityEncryption().orEmpty()
 
-
-        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
-        (streamSetting.tlsSettings
-            ?: streamSetting.realitySettings)?.let { tlsSetting ->
-            if (!TextUtils.isEmpty(tlsSetting.serverName)) {
-                dicQuery["sni"] = tlsSetting.serverName
-            }
-            if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
-                dicQuery["alpn"] =
-                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
-                dicQuery["fp"] = tlsSetting.fingerprint.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
-                dicQuery["pbk"] = tlsSetting.publicKey.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.shortId)) {
-                dicQuery["sid"] = tlsSetting.shortId.orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
-                dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX.orEmpty())
-            }
-        }
-        dicQuery["type"] =
-            streamSetting.network.ifEmpty { V2rayConfig.DEFAULT_NETWORK }
-
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            when (streamSetting.network) {
-                "tcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                }
-
-                "kcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["seed"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "ws", "httpupgrade", "splithttp" -> {
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "http", "h2" -> {
-                    dicQuery["type"] = "http"
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "quic" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    dicQuery["quicSecurity"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["key"] = Utils.urlEncode(transportDetails[2])
-                }
-
-                "grpc" -> {
-                    dicQuery["mode"] = transportDetails[0]
-                    dicQuery["authority"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["serviceName"] = Utils.urlEncode(transportDetails[2])
-                }
-            }
-        }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
-
-        val url = String.format(
-            "%s@%s:%s",
-            outbound.getPassword(),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
     }
 }

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

@@ -2,18 +2,19 @@ package com.v2ray.ang.util.fmt
 
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object VmessFmt {
+object VmessFmt : FmtBase() {
 
     fun parse(str: String): ServerConfig? {
         if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
@@ -29,7 +30,7 @@ object VmessFmt {
             Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
             return null
         }
-        val vmessQRCode = Gson().fromJson(result, VmessQRCode::class.java)
+        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
         // Although VmessQRCode fields are non null, looks like Gson may still create null fields
         if (TextUtils.isEmpty(vmessQRCode.add)
             || TextUtils.isEmpty(vmessQRCode.port)
@@ -100,7 +101,7 @@ object VmessFmt {
             vmessQRCode.host = transportDetails[1]
             vmessQRCode.path = transportDetails[2]
         }
-        val json = Gson().toJson(vmessQRCode)
+        val json = JsonUtil.toJson(vmessQRCode)
         return Utils.encode(json)
     }
 

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

@@ -8,7 +8,7 @@ import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object WireguardFmt {
+object WireguardFmt : FmtBase() {
     fun parse(str: String): ServerConfig? {
         val uri = URI(Utils.fixIllegalUrl(str))
         if (uri.rawQuery != null) {
@@ -71,37 +71,22 @@ object WireguardFmt {
     }
 
 
-
     fun toUri(config: ServerConfig): String {
         val outbound = config.getProxyOutbound() ?: return ""
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
+
         val dicQuery = HashMap<String, String>()
-        dicQuery["publickey"] =
-            Utils.urlEncode(outbound.settings?.peers?.get(0)?.publicKey.toString())
+        dicQuery["publickey"] = outbound.settings?.peers?.get(0)?.publicKey.toString()
         if (outbound.settings?.reserved != null) {
-            dicQuery["reserved"] = Utils.urlEncode(
-                Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString(","))
-                    .toString()
-            )
+            dicQuery["reserved"] = Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString(",")).toString()
+
         }
-        dicQuery["address"] = Utils.urlEncode(
-            Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString(","))
-                .toString()
-        )
+        dicQuery["address"] = Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString(",")).toString()
+
         if (outbound.settings?.mtu != null) {
             dicQuery["mtu"] = outbound.settings?.mtu.toString()
         }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
 
-        val url = String.format(
-            "%s@%s:%s",
-            Utils.urlEncode(outbound.getPassword().toString()),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
     }
 }

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

@@ -11,7 +11,6 @@ import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.google.gson.Gson
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
@@ -21,14 +20,15 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.V2rayConfigUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -98,7 +98,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             try {
                 val config = ServerConfig.create(EConfigType.CUSTOM)
                 config.subscriptionId = subscriptionId
-                config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
+                config.fullConfig = JsonUtil.fromJson(server, V2rayConfig::class.java)
                 config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
@@ -211,14 +211,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         getApplication<AngApplication>().toast(R.string.connection_test_testing)
         viewModelScope.launch(Dispatchers.Default) { // without Dispatchers.Default viewModelScope will launch in main thread
             for (item in serversCopy) {
-                val config = V2rayConfigUtil.getV2rayConfig(getApplication(), item.guid)
-                if (config.status) {
-                    MessageUtil.sendMsg2TestService(
-                        getApplication(),
-                        AppConfig.MSG_MEASURE_CONFIG,
-                        Pair(item.guid, config.content)
-                    )
-                }
+                MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid)
             }
         }
     }
@@ -394,11 +387,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 }
 
                 AppConfig.MSG_MEASURE_CONFIG_SUCCESS -> {
-                    val resultPair: Pair<String, Long> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                        intent.getSerializableExtra("content", Pair::class.java) as Pair<String, Long>
-                    } else {
-                        intent.getSerializableExtra("content") as Pair<String, Long>
-                    }
+                    val resultPair = intent.serializable<Pair<String, Long>>("content") ?: return
                     MmkvManager.encodeServerTestDelayMillis(resultPair.first, resultPair.second)
                     updateListAction.value = getPosition(resultPair.first)
                 }

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

@@ -89,7 +89,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|end"
-                    android:layout_marginBottom="24dp">
+                    android:layout_marginBottom="12dp">
 
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/fab"

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

@@ -13,6 +13,25 @@
 
         <include layout="@layout/layout_address_port" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/server_obfs_password" />
+
+            <EditText
+                android:id="@+id/et_obfs_password"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/edit_height"
+                android:inputType="text" />
+
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,7 +51,6 @@
 
         </LinearLayout>
 
-
         <include layout="@layout/layout_tls_hysteria2" />
 
         <LinearLayout

V2rayNG/app/src/main/res/menu/menu_routing_setting.xml

@@ -14,5 +14,13 @@
         android:id="@+id/import_rulesets"
         android:title="@string/routing_settings_import_rulesets"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/import_rulesets_from_clipboard"
+        android:title="@string/routing_settings_import_rulesets_from_clipboard"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/export_rulesets_to_clipboard"
+        android:title="@string/routing_settings_export_rulesets_to_clipboard"
+        app:showAsAction="never" />
 
 </menu>

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

@@ -112,6 +112,7 @@
     <string name="msg_file_not_found">الملف غير موجود</string>
     <string name="msg_remark_is_duplicate">الملاحظات موجودة بالفعل</string>
     <string name="toast_action_not_allowed">الإجراء غير مسموح به</string>
+    <string name="server_obfs_password">Obfs password</string>
 
     <!-- PerAppProxyActivity -->
     <string name="msg_dialog_progress">جار التحميل</string>
@@ -260,6 +261,8 @@
     <string name="routing_settings_add_rule">Add rule</string>
     <string name="routing_settings_import_rulesets">Import ruleset</string>
     <string name="routing_settings_import_rulesets_tip">Existing rulesets will be deleted, are you sure to continue?</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">Import ruleset from clipboard</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">Export ruleset to clipboard</string>
     <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
 
     <string name="connection_test_pending">التحقق من الاتصال</string>

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

@@ -111,6 +111,8 @@
     <string name="msg_file_not_found">ফাইল খুঁজে পাওয়া যায়নি</string>
     <string name="msg_remark_is_duplicate">মন্তব্য ইতিমধ্যে বিদ্যমান</string>
     <string name="toast_action_not_allowed">অ্যাকশন অনুমোদিত নয়</string>
+    <string name="server_obfs_password">Obfs password</string>
+
     <!-- PerAppProxyActivity -->
     <string name="msg_dialog_progress">লোড হচ্ছে</string>
     <string name="menu_item_search">অনুসন্ধান করুন</string>
@@ -257,6 +259,8 @@
     <string name="routing_settings_add_rule">Add rule</string>
     <string name="routing_settings_import_rulesets">Import ruleset</string>
     <string name="routing_settings_import_rulesets_tip">Existing rulesets will be deleted, are you sure to continue?</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">Import ruleset from clipboard</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">Export ruleset to clipboard</string>
     <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
 
     <string name="connection_test_pending">সংযোগ পরীক্ষা করুন</string>

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

@@ -105,6 +105,7 @@
     <string name="title_url">URL</string>
     <string name="menu_item_download_file">دانلود فایل‌ها</string>
     <string name="toast_action_not_allowed">این عمل ممنوع است</string>
+    <string name="server_obfs_password">Obfs password</string>
 
     <!-- PerAppProxyActivity -->
     <string name="title_user_asset_add_url">URL را اضافه کنید</string>
@@ -126,8 +127,8 @@
     <string name="title_vpn_settings">تنظیمات VPN</string>
     <string name="title_pref_per_app_proxy">پروکسی به تفکیک برنامه</string>
     <string name="summary_pref_per_app_proxy">عمومی: برنامه بررسی شده پروکسی است، اتصال مستقیم بدون بررسی است. \nحالت bypass: برنامه بررسی شده مستقیما متصل است، پراکسی بررسی نشده است. \nگزینه‌ای برای انتخاب خودکار پروکسی برنامه در منو است</string>
-    <string name="title_pref_is_booted">Auto connect at startup</string>
-    <string name="summary_pref_is_booted">Automatically connects to the selected server at startup, which may be unsuccessful</string>
+    <string name="title_pref_is_booted">اتصال خودکار هنگام راه اندازی</string>
+    <string name="summary_pref_is_booted">هنگام راه اندازی به طور خودکار به سرور انتخابی متصل می شود که ممکن است ناموفق باشد</string>
 
     <string name="title_mux_settings">تنظیمات Mux</string>
     <string name="title_pref_mux_enabled">فعال کردن Mux</string>
@@ -146,8 +147,8 @@
 
     <string name="title_pref_sniffing_enabled">فعال کردن Sniffing</string>
     <string name="summary_pref_sniffing_enabled">دامنه sniff را از بسته امتحان کنید (پیش‌فرض روشن)</string>
-    <string name="title_pref_route_only_enabled">Enable routeOnly</string>
-    <string name="summary_pref_route_only_enabled">Use the sniffed domain name for routing only, and keep the target address as the IP address.</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>
@@ -174,8 +175,8 @@
     <string name="summary_pref_proxy_sharing_enabled">دستگاه‌های دیگر می‌توانند از طریق socks/http به پراکسی توسط نشانی آی‌پی شما متصل شوند، فقط در شبکه مورد اعتماد فعال می‌شوند تا از اتصال غیرمجاز جلوگیری کنند</string>
     <string name="toast_warning_pref_proxysharing_short">اتصالات از طریق LAN را مجاز کنید، مطمئن شوید که در یک شبکه قابل اعتماد هستید</string>
 
-    <string name="title_pref_allow_insecure">allowInsecure</string>
-    <string name="summary_pref_allow_insecure">هنگام استفاده از TLS، به طور پیش‌فرض allowInsecure فعال است</string>
+    <string name="title_pref_allow_insecure">موز ناامن</string>
+    <string name="summary_pref_allow_insecure">هنگام استفاده از TLS، به طور پیش‌فرض مجوز ناامن فعال است</string>
 
     <string name="title_pref_socks_port">پورت پروکسی SOCKS5</string>
     <string name="summary_pref_socks_port">پورت پروکسی SOCKS5</string>
@@ -199,12 +200,12 @@
 
     <string name="title_privacy_policy">حریم خصوصی</string>
     <string name="title_about">درباره</string>
-    <string name="title_source_code">Source code</string>
-    <string name="title_tg_channel">Telegram channel</string>
-    <string name="title_configuration_backup">Backup configuration</string>
-    <string name="summary_configuration_backup">Storage location: [%s], The backup will be cleared after uninstalling the app or clearing the storage</string>
-    <string name="title_configuration_restore">Restore configuration</string>
-    <string name="title_configuration_share">Share configuration</string>
+    <string name="title_source_code">کد منبع</string>
+    <string name="title_tg_channel">کانال تلگرام</string>
+    <string name="title_configuration_backup">پشتیبانگیری از پیکربندی</string>
+    <string name="summary_configuration_backup">محل ذخیره سازی: [%s], پس از حذف نصب برنامه یا پاک کردن فضای ذخیره سازی، نسخه پشتیبان پاک می شود</string>
+    <string name="title_configuration_restore">بازیابی پیکربندی</string>
+    <string name="title_configuration_share">اشتراکگذاری پیکربندی</string>
     <string name="title_pref_promotion">تبلیغات</string>
     <string name="summary_pref_promotion">تبلیغات، برای جزئیات بیشتر کلیک کنید (کمک مالی کنید تا حذف شود)</string>
 
@@ -251,12 +252,14 @@
     <string name="routing_settings_title">تنظیمات مسیریابی</string>
     <string name="routing_settings_tips">با کاما (,) از هم جدا شوند، ذخیره کردن فراموش نشود</string>
     <string name="routing_settings_save">ذخیره</string>
-    <string name="routing_settings_delete">پاک کردن</string>
-    <string name="routing_settings_rule_title">Routing Rule Settings</string>
-    <string name="routing_settings_add_rule">Add rule</string>
-    <string name="routing_settings_import_rulesets">Import ruleset</string>
-    <string name="routing_settings_import_rulesets_tip">Existing rulesets will be deleted, are you sure to continue?</string>
-    <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
+    <string name="routing_settings_delete">حذف</string>
+    <string name="routing_settings_rule_title">تنظیمات قانون مسیریابی</string>
+    <string name="routing_settings_add_rule">اضافه کردن قانون</string>
+    <string name="routing_settings_import_rulesets">وارد کردن مجموعه قوانین</string>
+    <string name="routing_settings_import_rulesets_tip">مجموعه قوانین موجود حذف خواهند شد، آیا مطمئن هستید که ادامه می دهید؟</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">وارد کردن مجموعه قوانین از کلیپ بورد</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">صادر کردن مجموعه قوانین به کلیپ بورد</string>
+    <string name="routing_settings_locked">قفل است، این قانون را هنگام وارد کردن از پیش تنظیم‌ها حفظ کنید</string>
 
     <string name="connection_test_pending">اتصال را بررسی کنید</string>
     <string name="connection_test_testing">در حال آزمایش...</string>
@@ -298,4 +301,11 @@
         <item>Dark</item>
     </string-array>
 
+    <string-array name="preset_rulesets">
+        <item>لیست سفید چین</item>
+        <item>لیست سیاه چین</item>
+        <item>جهانی(Global)</item>
+        <item>ایران</item>
+    </string-array>
+    
 </resources>

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

@@ -110,7 +110,7 @@
     <string name="msg_file_not_found">Файл не найден</string>
     <string name="msg_remark_is_duplicate">Название уже существует</string>
     <string name="toast_action_not_allowed">Это действие запрещено</string>
-
+    <string name="server_obfs_password">Пароль obfs</string>
 
     <!-- PerAppProxyActivity -->
     <string name="msg_dialog_progress">Загрузка…</string>
@@ -130,8 +130,8 @@
     <string name="title_vpn_settings">Настройки VPN</string>
     <string name="title_pref_per_app_proxy">Прокси для выбранных приложений</string>
     <string name="summary_pref_per_app_proxy">Основной: выделенное приложение соединяется через прокси, не выделенное — напрямую;\nРежим обхода: выделенное приложение соединяется напрямую, не выделенное — через прокси.\nЕсть возможность автоматического выбора проксируемых приложений в меню.</string>
-    <string name="title_pref_is_booted">Auto connect at startup</string>
-    <string name="summary_pref_is_booted">Automatically connects to the selected server at startup, which may be unsuccessful</string>
+    <string name="title_pref_is_booted">Автоподключение при запуске</string>
+    <string name="summary_pref_is_booted">Автоматически подключаться к выбранному серверу при запуске приложения (может оказаться неудачным)</string>
 
     <string name="title_mux_settings">Настройки мультиплексирования</string>
     <string name="title_pref_mux_enabled">Использовать мультиплексирование</string>
@@ -235,10 +235,10 @@
     <string name="sub_setting_url">URL (необязательно)</string>
     <string name="sub_setting_filter">Название фильтра</string>
     <string name="sub_setting_enable">Использовать обновление</string>
-    <string name="sub_auto_update">Использовать автоматическое обновление</string>
+    <string name="sub_auto_update">Использовать автообновление</string>
     <string name="sub_setting_pre_profile">Название предыдущего прокси</string>
     <string name="sub_setting_next_profile">Название следующего прокси</string>
-    <string name="sub_setting_pre_profile_tip">Убедитесь, что название существует и является уникальным</string>
+    <string name="sub_setting_pre_profile_tip">Название должно существовать и быть уникальным</string>
     <string name="title_sub_update">Обновить подписку группы</string>
     <string name="title_ping_all_server">Проверка профилей группы</string>
     <string name="title_real_ping_all_server">Время отклика профилей группы</string>
@@ -253,14 +253,16 @@
 
     <string name="routing_settings_domain_strategy">Доменная стратегия</string>
     <string name="routing_settings_title">Маршрутизация</string>
-    <string name="routing_settings_tips">Введите требуемые значения через запятую</string>
+    <string name="routing_settings_tips">Введите требуемые домены/IP через запятую</string>
     <string name="routing_settings_save">Сохранить</string>
     <string name="routing_settings_delete">Очистить</string>
     <string name="routing_settings_rule_title">Настройка правил маршрутизации</string>
     <string name="routing_settings_add_rule">Добавить правило</string>
     <string name="routing_settings_import_rulesets">Импорт правил</string>
     <string name="routing_settings_import_rulesets_tip">Существующие правила будут удалены. Продолжить?</string>
-    <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">Импорт правил из буфера обмена</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">Экспорт правил в буфер обмена</string>
+    <string name="routing_settings_locked">Постоянное (сохранится при импорте правил)</string>
     <string name="routing_settings_domain">Домен</string>
     <string name="routing_settings_ip">IP</string>
     <string name="routing_settings_port">Порт</string>

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

@@ -105,6 +105,7 @@
     <string name="title_url">URL</string>
     <string name="menu_item_download_file">Tải xuống tệp tin</string>
     <string name="toast_action_not_allowed">Hành động này bị cấm!</string>
+    <string name="server_obfs_password">Obfs password</string>
 
     <!-- PerAppProxyActivity -->
     <string name="title_user_asset_add_url">Thêm URL nội dung</string>
@@ -259,6 +260,8 @@
     <string name="routing_settings_add_rule">Add rule</string>
     <string name="routing_settings_import_rulesets">Import ruleset</string>
     <string name="routing_settings_import_rulesets_tip">Existing rulesets will be deleted, are you sure to continue?</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">Import ruleset from clipboard</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">Export ruleset to clipboard</string>
     <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
 
     <string name="connection_test_pending">Kiểm tra kết nối</string>

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

@@ -105,7 +105,7 @@
     <string name="title_url">URL</string>
     <string name="menu_item_download_file">下载文件</string>
     <string name="toast_action_not_allowed">禁止此项操作</string>
-
+    <string name="server_obfs_password">混淆密码</string>
 
     <!-- PerAppProxyActivity -->
     <string name="title_user_asset_add_url">添加资产网址</string>
@@ -257,6 +257,8 @@
     <string name="routing_settings_add_rule">添加规则</string>
     <string name="routing_settings_import_rulesets">导入预设规则集</string>
     <string name="routing_settings_import_rulesets_tip">将删除现有的规则集，是否确定继续？</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">从剪贴板导入规则集</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">导出规则集至剪贴板</string>
     <string name="routing_settings_locked">锁定中，导入预设时不删除此规则</string>
 
     <string name="connection_test_pending">"检查网络连接"</string>
@@ -304,6 +306,7 @@
         <item>绕过大陆(Whitelist)</item>
         <item>黑名单(Blacklist)</item>
         <item>全局(Global)</item>
+        <item>伊朗(Iran)</item>
     </string-array>
 
 </resources>

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

@@ -18,12 +18,12 @@
     <string name="toast_services_failure">啟動服務失敗</string>
 
     <!--ServerActivity-->
-    <string name="title_server">配置檔案</string>
-    <string name="menu_item_add_config">新增配置</string>
-    <string name="menu_item_save_config">儲存配置</string>
-    <string name="menu_item_del_config">刪除配置</string>
-    <string name="menu_item_import_config_qrcode">從 QR Code 匯入配置</string>
-    <string name="menu_item_import_config_clipboard">從剪貼簿匯入配置</string>
+    <string name="title_server">設定檔</string>
+    <string name="menu_item_add_config">新增設定</string>
+    <string name="menu_item_save_config">儲存設定</string>
+    <string name="menu_item_del_config">刪除設定</string>
+    <string name="menu_item_import_config_qrcode">從 QR Code 匯入設定</string>
+    <string name="menu_item_import_config_clipboard">從剪貼簿匯入設定</string>
     <string name="menu_item_import_config_manually_vmess">手動鍵入 [VMess]</string>
     <string name="menu_item_import_config_manually_vless">手動鍵入 [VLESS]</string>
     <string name="menu_item_import_config_manually_ss">手動鍵入 [Shadowsocks]</string>
@@ -32,11 +32,11 @@
     <string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
     <string name="menu_item_import_config_manually_wireguard">手動鍵入 [Wireguard]</string>
     <string name="menu_item_import_config_manually_hysteria2">手動鍵入 [Hysteria2]</string>
-    <string name="menu_item_import_config_custom">自訂配置</string>
-    <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂配置</string>
-    <string name="menu_item_import_config_custom_local">從本地匯入自訂配置</string>
-    <string name="menu_item_import_config_custom_url">從 URL 匯入自訂配置</string>
-    <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂配置</string>
+    <string name="menu_item_import_config_custom">自訂設定</string>
+    <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂設定</string>
+    <string name="menu_item_import_config_custom_local">從本地匯入自訂設定</string>
+    <string name="menu_item_import_config_custom_url">從 URL 匯入自訂設定</string>
+    <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂設定</string>
     <string name="del_config_comfirm">確定刪除？</string>
     <string name="del_invalid_config_comfirm">刪除前請先測試！確認刪除？</string>
     <string name="server_lab_remarks">備註</string>
@@ -90,21 +90,22 @@
     <string name="toast_none_data">無資料</string>
     <string name="toast_incorrect_protocol">通訊協定不正確</string>
     <string name="toast_decoding_failed">解碼失敗</string>
-    <string name="title_file_chooser">選取一個配置檔</string>
+    <string name="title_file_chooser">選取一個設定檔</string>
     <string name="toast_require_file_manager">請安裝檔案總管。</string>
-    <string name="server_customize_config">自訂配置</string>
-    <string name="toast_config_file_invalid">無效配置</string>
+    <string name="server_customize_config">自訂設定</string>
+    <string name="toast_config_file_invalid">無效設定</string>
     <string name="server_lab_content">內容</string>
     <string name="toast_none_data_clipboard">剪貼簿內無資料</string>
     <string name="toast_invalid_url">URL 無效</string>
     <string name="server_lab_need_inbound">​​確保 inbounds port 和設定中的一致</string>
-    <string name="toast_malformed_josn">配置格式不正確</string>
+    <string name="toast_malformed_josn">設定格式不正確</string>
     <string name="server_lab_request_host6">Host(SNI)(可選)</string>
     <string name="toast_asset_copy_failed">失敗，請使用檔案總管</string>
     <string name="menu_item_add_file">新增檔案</string>
     <string name="title_url">URL</string>
     <string name="menu_item_download_file">下載檔案</string>
     <string name="toast_action_not_allowed">禁止此項操作</string>
+    <string name="server_obfs_password">混淆密碼</string>
 
     <!-- PerAppProxyActivity -->
     <string name="title_user_asset_add_url">新增資產網址</string>
@@ -187,8 +188,8 @@
     <string name="title_pref_local_dns_port">本機 DNS 埠</string>
     <string name="summary_pref_local_dns_port">本機 DNS 埠</string>
 
-    <string name="title_pref_confirm_remove">刪除配置檔案確認</string>
-    <string name="summary_pref_confirm_remove">刪除配置檔案是否需要用戶二次確認</string>
+    <string name="title_pref_confirm_remove">刪除設定檔確認</string>
+    <string name="summary_pref_confirm_remove">刪除設定檔是否需要用戶二次確認</string>
 
     <string name="title_pref_start_scan_immediate">立即啟動掃碼</string>
     <string name="summary_pref_start_scan_immediate">啟動時立即打開相機掃描，否則可在工具欄選擇掃碼或選照片</string>
@@ -201,10 +202,10 @@
     <string name="title_about">關於</string>
     <string name="title_source_code">原始碼</string>
     <string name="title_tg_channel">Telegram 頻道</string>
-    <string name="title_configuration_backup">備份配置</string>
+    <string name="title_configuration_backup">備份設定</string>
     <string name="summary_configuration_backup">儲存位置: [%s], 卸載App或清除儲存後備份將被清除</string>
-    <string name="title_configuration_restore">還原配置</string>
-    <string name="title_configuration_share">分享配置</string>
+    <string name="title_configuration_restore">還原設定</string>
+    <string name="title_configuration_share">分享設定</string>
 
     <string name="title_pref_promotion">推廣</string>
     <string name="summary_pref_promotion">一些推廣，輕觸以檢視 (捐贈可去除)</string>
@@ -224,10 +225,10 @@
     <string name="logcat_copy">複製</string>
     <string name="logcat_clear">清除</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>
-    <string name="title_export_all">匯出目前群組配置至剪貼簿</string>
+    <string name="title_del_all_config">刪除目前群組設定</string>
+    <string name="title_del_duplicate_config">刪除目前群組重複設定</string>
+    <string name="title_del_invalid_config">刪除目前群組無效設定</string>
+    <string name="title_export_all">匯出目前群組設定至剪貼簿</string>
     <string name="title_sub_setting">訂閱分組設定</string>
     <string name="sub_setting_remarks">備註</string>
     <string name="sub_setting_url">可選位址(url)</string>
@@ -238,11 +239,11 @@
     <string name="sub_setting_next_profile">落地代理別名</string>
     <string name="sub_setting_pre_profile_tip">请确保别名存在并唯一</string>
     <string name="title_sub_update">更新目前群組訂閱</string>
-    <string name="title_ping_all_server">偵測目前群組配置 Tcping</string>
-    <string name="title_real_ping_all_server">偵測目前群組配置真延遲</string>
+    <string name="title_ping_all_server">偵測目前群組設定 Tcping</string>
+    <string name="title_real_ping_all_server">偵測目前群組設定真延遲</string>
     <string name="title_user_asset_setting">Geo 資源檔案</string>
     <string name="title_sort_by_test_results">依偵測結果排序</string>
-    <string name="title_filter_config">過濾配置</string>
+    <string name="title_filter_config">過濾設定</string>
     <string name="filter_config_all">所有分組</string>
     <string name="title_del_duplicate_config_count">Delete %d duplicate configurations</string>
 
@@ -258,6 +259,8 @@
     <string name="routing_settings_add_rule">新增規則</string>
     <string name="routing_settings_import_rulesets">匯入預設規則集</string>
     <string name="routing_settings_import_rulesets_tip">將刪除現有的規則集，是否確定繼續？ </string>
+    <string name="routing_settings_import_rulesets_from_clipboard">從剪貼簿匯入規則集</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">匯出規則集至剪貼簿</string>
     <string name="routing_settings_locked">鎖定中，匯入預設時不刪除此規則</string>
 
     <string name="connection_test_pending">"測試連線能力"</string>
@@ -282,7 +285,7 @@
     <string-array name="share_method">
         <item>QR Code</item>
         <item>匯出至剪貼簿</item>
-        <item>匯出完整配置至剪貼簿</item>
+        <item>匯出完整設定至剪貼簿</item>
     </string-array>
 
     <string-array name="share_sub_method">
@@ -305,6 +308,7 @@
         <item>繞過大陸(Whitelist)</item>
         <item>黑名單(Blacklist)</item>
         <item>全域(Global)</item>
+        <item>伊朗(Iran)</item>
     </string-array>
 
 </resources>

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

@@ -111,7 +111,7 @@
     <string name="msg_file_not_found">File not found</string>
     <string name="msg_remark_is_duplicate">The remarks already exists</string>
     <string name="toast_action_not_allowed">Action not allowed</string>
-
+    <string name="server_obfs_password">Obfs password</string>
 
     <!-- PerAppProxyActivity -->
     <string name="msg_dialog_progress">Loading</string>
@@ -263,6 +263,8 @@
     <string name="routing_settings_add_rule">Add rule</string>
     <string name="routing_settings_import_rulesets">Import ruleset</string>
     <string name="routing_settings_import_rulesets_tip">Existing rulesets will be deleted, are you sure to continue?</string>
+    <string name="routing_settings_import_rulesets_from_clipboard">Import ruleset from clipboard</string>
+    <string name="routing_settings_export_rulesets_to_clipboard">Export ruleset to clipboard</string>
     <string name="routing_settings_locked">Locked, keep this rule when import presets</string>
     <string name="routing_settings_domain" translatable="false">domain</string>
     <string name="routing_settings_ip" translatable="false">ip</string>
@@ -316,6 +318,7 @@
         <item>China Whitelist</item>
         <item>China Blacklist</item>
         <item>Global</item>
+        <item>Iran Whitelist</item>
     </string-array>
 
 </resources>

V2rayNG/gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-activityKtx = "1.9.2"
+activityKtx = "1.9.3"
 appcompat = "1.7.0"
 cardview = "1.0.0"
 constraintlayout = "2.1.4"
 core = "3.5.3"
 editorkit = "2.9.0"
 flexbox = "3.0.0"
-fragmentKtx = "1.8.3"
+fragmentKtx = "1.8.4"
 gson = "2.11.0"
 junit = "4.13.2"
 kotlinReflect = "2.0.20"
 kotlinxCoroutinesCore = "1.9.0"
 legacySupportV4 = "1.0.0"
-lifecycleViewmodelKtx = "2.8.5"
+lifecycleViewmodelKtx = "2.8.6"
 material = "1.12.0"
 mmkvStatic = "1.3.9"
 multidex = "2.0.1"