up 1.8.4

Merge pull request #2227 from AlirezaIvaz/master
Add themed icon support
2023-04-29 20:46:28 +08:00 · 2023-04-27 09:40:08 +08:00 · 2023-04-26 17:05:11 +03:30 · 2023-04-22 14:40:57 +08:00 · 2023-04-21 21:33:22 +03:00 · 2023-04-19 19:45:11 +08:00
40 changed files with 594 additions and 414 deletions
--- a/V2rayNG/app/build.gradle
+++ b/V2rayNG/app/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-Properties props = new Properties()
-props.load(new FileInputStream(new File('local.properties')))
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}

 android {
    compileSdkVersion Integer.parseInt("$compileSdkVer")
@@ -18,25 +17,8 @@ android {
        minSdkVersion 21
        targetSdkVersion Integer.parseInt("$targetSdkVer")
        multiDexEnabled true
-        versionCode 495
-        versionName "1.7.33"
-    }
-
-    if (props["sign"]) {
-        signingConfigs {
-            release {
-                storeFile file("../key.jks")
-                keyAlias 'ang'
-                keyPassword '123456'
-                storePassword '123456'
-            }
-            debug {
-                storeFile file("../key.jks")
-                keyAlias 'ang'
-                keyPassword '123456'
-                storePassword '123456'
-            }
-        }
+        versionCode 515
+        versionName "1.8.4"
    }

    buildTypes {
@@ -44,19 +26,12 @@ android {
            minifyEnabled false
            zipAlignEnabled false
            shrinkResources false
-            if (props["sign"]) {
-                signingConfig signingConfigs.release
-            }
            ndk.abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
        debug {
            minifyEnabled false
            zipAlignEnabled false
            shrinkResources false
-            if (props["sign"]) {
-                signingConfig signingConfigs.release
-            }
            ndk.abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
        }
    }
@@ -98,6 +73,8 @@ android {
    buildFeatures {
        viewBinding true
    }
+    namespace 'com.v2ray.ang'
+    testNamespace 'com.v2ray.angTest'
 }

 dependencies {
@@ -107,45 +84,36 @@ dependencies {
    // Androidx
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.2'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.6'
    implementation 'androidx.multidex:multidex:2.0.1'
    implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'

    // Androidx ktx
-    implementation 'androidx.activity:activity-ktx:1.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-ktx:1.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'

    //kotlin
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

-    implementation 'com.tencent:mmkv-static:1.2.12'
-    implementation 'com.google.code.gson:gson:2.8.9'
-    implementation 'io.reactivex:rxjava:1.3.4'
+    implementation 'com.tencent:mmkv-static:1.2.15'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'io.reactivex:rxjava:1.3.8'
    implementation 'io.reactivex:rxandroid:1.2.1'
    implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
-    implementation 'me.dm7.barcodescanner:core:1.9.8'
-    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
    implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
    implementation 'me.drakeet.support:toastcompat:1.1.0'
    implementation 'com.blacksquircle.ui:editorkit:2.1.1'
    implementation 'com.blacksquircle.ui:language-base:2.1.1'
    implementation 'com.blacksquircle.ui:language-json:2.1.1'
-}
-
-//buildscript {
-//    repositories {
-//        google()
-//        mavenCentral()
-//        maven { url 'https://maven.google.com' }
-//        maven { url 'https://jitpack.io' }
-//    }
-//}
+    implementation 'io.github.g00fy2.quickie:quickie-bundled:1.6.0'
+    implementation 'com.google.zxing:core:3.5.1'
+}
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.v2ray.ang">
+    xmlns:tools="http://schemas.android.com/tools">

    <supports-screens
        android:anyDensity="true"
@@ -24,6 +23,9 @@
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+

    <application
        android:name=".AngApplication"
@@ -31,13 +33,15 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
-        android:theme="@style/AppThemeLight"
+        android:theme="@style/AppThemeDayNight"
        android:usesCleartextTraffic="true"
        tools:targetApi="m">
+
        <activity
-            android:exported="true"
            android:name=".ui.MainActivity"
-            android:launchMode="singleTask">
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@style/AppThemeDayNight.NoActionBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt
@@ -39,6 +39,7 @@ object AppConfig {
    const val PREF_PER_APP_PROXY_SET = "pref_per_app_proxy_set"
    const val PREF_BYPASS_APPS = "pref_bypass_apps"
    const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
+    const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"

    const val HTTP_PROTOCOL: String = "http://"
    const val HTTPS_PROTOCOL: String = "https://"
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
@@ -29,7 +29,7 @@ data class V2rayConfig(
        const val DEFAULT_NETWORK = "tcp"

        const val TLS = "tls"
-        const val XTLS = "xtls"
+        const val REALITY = "reality"
        const val HTTP = "http"
    }

@@ -130,7 +130,7 @@ data class V2rayConfig(
                                      var httpSettings: HttpSettingsBean? = null,
                                      var tlsSettings: TlsSettingsBean? = null,
                                      var quicSettings: QuicSettingBean? = null,
-                                      var xtlsSettings: TlsSettingsBean? = null,
+                                      var realitySettings: TlsSettingsBean? = null,
                                      var grpcSettings: GrpcSettingsBean? = null,
                                      val dsSettings: Any? = null,
                                      val sockopt: Any? = null
@@ -189,7 +189,12 @@ data class V2rayConfig(
                                       val fingerprint: String? = null,
                                       val certificates: List<Any>? = null,
                                       val disableSystemRoot: Boolean? = null,
-                                       val enableSessionResumption: Boolean? = null)
+                                       val enableSessionResumption: Boolean? = null,
+                    // REALITY settings
+                                       val show: Boolean = false,
+                                       var publicKey: String? = null,
+                                       var shortId: String? = null,
+                                       var spiderX: String? = null)

            data class QuicSettingBean(var security: String = "none",
                                       var key: String = "",
@@ -265,20 +270,24 @@ data class V2rayConfig(
                return sni
            }

-            fun populateTlsSettings(streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?) {
+            fun populateTlsSettings(streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?,
+                                    publicKey: String?, shortId: String?, spiderX: String?) {
                security = streamSecurity
                val tlsSetting = TlsSettingsBean(
-                    allowInsecure = allowInsecure,
-                    serverName = sni,
-                    fingerprint = fingerprint,
-                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                        allowInsecure = allowInsecure,
+                        serverName = sni,
+                        fingerprint = fingerprint,
+                        alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+                        publicKey = publicKey,
+                        shortId = shortId,
+                        spiderX = spiderX
                )
                if (security == TLS) {
                    tlsSettings = tlsSetting
-                    xtlsSettings = null
-                } else if (security == XTLS) {
+                    realitySettings = null
+                } else if (security == REALITY) {
                    tlsSettings = null
-                    xtlsSettings = tlsSetting
+                    realitySettings = tlsSetting
                }
            }
        }
@@ -438,7 +447,7 @@ data class V2rayConfig(
                           var poolSize: Int = 10000) // roughly 10 times smaller than total ip pool

    fun getProxyOutbound(): OutboundBean? {
-        outbounds.forEach { outbound ->
+        outbounds?.forEach { outbound ->
            EConfigType.values().forEach {
                if (outbound.protocol.equals(it.name, true)) {
                    return outbound
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt
@@ -13,4 +13,5 @@ data class VmessQRCode(var v: String = "",
                       var path: String = "",
                       var tls: String = "",
                       var sni: String = "",
-                       var alpn: String = "")
+                       var alpn: String = "",
+                       var fp: String = "")
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/TaskerReceiver.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/TaskerReceiver.kt
@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
-import com.google.zxing.WriterException
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.service.V2RayServiceManager
@@ -34,7 +33,7 @@ class TaskerReceiver : BroadcastReceiver() {
            } else {
                Utils.stopVService(context)
            }
-        } catch (e: WriterException) {
+        } catch (e: Exception) {
            e.printStackTrace()
        }
    }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
@@ -2,12 +2,10 @@ package com.v2ray.ang.ui

 import android.content.Context
 import android.os.Build
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.view.MenuItem
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.R
 import com.v2ray.ang.util.Utils

 abstract class BaseActivity : AppCompatActivity() {
@@ -19,27 +17,6 @@ abstract class BaseActivity : AppCompatActivity() {
        else -> super.onOptionsItemSelected(item)
    }

-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        checkDarkMode()
-    }
-
-    private fun checkDarkMode() {
-        if (Utils.getDarkModeStatus(this)) {
-            if (this.javaClass.simpleName == "MainActivity") {
-                setTheme(R.style.AppThemeDark_NoActionBar)
-            } else {
-                setTheme(R.style.AppThemeDark)
-            }
-        } else {
-            if (this.javaClass.simpleName == "MainActivity") {
-                setTheme(R.style.AppThemeLight_NoActionBar)
-            } else {
-                setTheme(R.style.AppThemeLight)
-            }
-        }
-    }
-
    @RequiresApi(Build.VERSION_CODES.N)
    override fun attachBaseContext(newBase: Context?) {
        val context = newBase?.let {
@@ -47,7 +24,4 @@ abstract class BaseActivity : AppCompatActivity() {
        }
        super.attachBaseContext(context)
    }
-
-
-
-}
+}
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
@@ -14,6 +14,7 @@ import android.text.TextUtils
 import android.view.KeyEvent
 import com.v2ray.ang.AppConfig
 import android.content.res.ColorStateList
+import android.os.Build
 import com.google.android.material.navigation.NavigationView
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
@@ -107,6 +108,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        setupViewModel()
        copyAssets()
        migrateLegacy()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            RxPermissions(this)
+                .request(Manifest.permission.POST_NOTIFICATIONS)
+                .subscribe {
+                    if (!it)
+                        toast(R.string.toast_permission_denied)
+                }
+        }
    }

    private fun setupViewModel() {
@@ -297,7 +307,14 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                    .show()
            true
        }
-
+        R.id.del_duplicate_config-> {
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    mainViewModel.removeDuplicateServer()
+                }
+                .show()
+            true
+        }
        R.id.del_invalid_config -> {
            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                .setPositiveButton(android.R.string.ok) { _, _ ->
@@ -620,11 +637,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        }
    }

+    @Deprecated("Deprecated in Java")
    override fun onBackPressed() {
        if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
            binding.drawerLayout.closeDrawer(GravityCompat.START)
        } else {
-            super.onBackPressed()
+            //super.onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
        }
    }

--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt
@@ -3,57 +3,62 @@ package com.v2ray.ang.ui
 import android.Manifest
 import android.app.Activity
 import android.os.Bundle
-import com.google.zxing.Result
-import me.dm7.barcodescanner.zxing.ZXingScannerView
 import android.content.Intent
 import android.graphics.BitmapFactory
+import android.os.Build
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
-import com.google.zxing.BarcodeFormat
 import com.tbruyelle.rxpermissions.RxPermissions
+import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
+import io.github.g00fy2.quickie.QRResult
+import io.github.g00fy2.quickie.ScanCustomCode
+import io.github.g00fy2.quickie.config.ScannerConfig

-class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
+class ScannerActivity : BaseActivity(){

-    private var mScannerView: ZXingScannerView? = null
+    private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
+    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }

    public override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        mScannerView = ZXingScannerView(this)   // Programmatically initialize the scanner view

-        mScannerView?.setAutoFocus(true)
-        val formats = ArrayList<BarcodeFormat>()
-        formats.add(BarcodeFormat.QR_CODE)
-        mScannerView?.setFormats(formats)
-
-        setContentView(mScannerView)                // Set the scanner view as the content view
+        if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
+            launchScan()
+        }

        supportActionBar?.setDisplayHomeAsUpEnabled(true)
    }

    public override fun onResume() {
        super.onResume()
-        mScannerView!!.setResultHandler(this) // Register ourselves as a handler for scan results.
-        mScannerView!!.startCamera()          // Start camera on resume
    }

    public override fun onPause() {
        super.onPause()
-        mScannerView!!.stopCamera()           // Stop camera on pause
    }

-    override fun handleResult(rawResult: Result) {
-        // Do something with the result here
-//        Log.v(FragmentActivity.TAG, rawResult.text) // Prints scan results
-//        Log.v(FragmentActivity.TAG, rawResult.barcodeFormat.toString()) // Prints the scan format (qrcode, pdf417 etc.)
+    private fun launchScan(){
+        scanQrCode.launch(
+            ScannerConfig.build {
+                setHapticSuccessFeedback(true) // enable (default) or disable haptic feedback when a barcode was detected
+                setShowTorchToggle(true) // show or hide (default) torch/flashlight toggle button
+                setShowCloseButton(true) // show or hide (default) close button
+            }
+        )
+    }

-        finished(rawResult.text)
-
-        // If you would like to resume scanning, call this method below:
-//        mScannerView!!.resumeCameraPreview(this)
+    private fun handleResult(result: QRResult) {
+        if (result is QRResult.QRSuccess ) {
+            finished(result.content.rawValue)
+        } else {
+            finish()
+        }
    }

    private fun finished(text: String) {
@@ -69,19 +74,28 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
    }

    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.scan_code -> {
+            launchScan()
+            true
+        }
        R.id.select_photo -> {
+            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            }
            RxPermissions(this)
-                    .request(Manifest.permission.READ_EXTERNAL_STORAGE)
-                    .subscribe {
-                        if (it) {
-                            try {
-                                showFileChooser()
-                            } catch (e: Exception) {
-                                e.printStackTrace()
-                            }
-                        } else
-                            toast(R.string.toast_permission_denied)
-                    }
+                .request(permission)
+                .subscribe {
+                    if (it) {
+                        try {
+                            showFileChooser()
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+                    } else
+                        toast(R.string.toast_permission_denied)
+                }
            true
        }
        else -> super.onOptionsItemSelected(item)
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt
@@ -15,6 +15,7 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_PORT
+import com.v2ray.ang.dto.V2rayConfig.Companion.TLS
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.MmkvManager.ID_MAIN
@@ -84,14 +85,24 @@ class ServerActivity : BaseActivity() {
    private val sp_security: Spinner? by lazy { findViewById(R.id.sp_security) }
    private val sp_stream_security: Spinner? by lazy { findViewById(R.id.sp_stream_security) }
    private val sp_allow_insecure: Spinner? by lazy { findViewById(R.id.sp_allow_insecure) }
+    private val container_allow_insecure: LinearLayout? by lazy { findViewById(R.id.l5) }
    private val et_sni: EditText? by lazy { findViewById(R.id.et_sni) }
+    private val container_sni: LinearLayout? by lazy { findViewById(R.id.l2) }
    private val sp_stream_fingerprint: Spinner? by lazy { findViewById(R.id.sp_stream_fingerprint) } //uTLS
+    private val container_fingerprint: LinearLayout? by lazy { findViewById(R.id.l3) }
    private val sp_network: Spinner? by lazy { findViewById(R.id.sp_network) }
    private val sp_header_type: Spinner? by lazy { findViewById(R.id.sp_header_type) }
    private val sp_header_type_title: TextView? by lazy { findViewById(R.id.sp_header_type_title) }
    private val et_request_host: EditText? by lazy { findViewById(R.id.et_request_host) }
    private val et_path: EditText? by lazy { findViewById(R.id.et_path) }
    private val sp_stream_alpn: Spinner? by lazy { findViewById(R.id.sp_stream_alpn) } //uTLS
+    private val container_alpn: LinearLayout? by lazy { findViewById(R.id.l4) }
+    private val et_public_key: EditText? by lazy { findViewById(R.id.et_public_key) }
+    private val container_public_key: LinearLayout? by lazy { findViewById(R.id.l6) }
+    private val et_short_id: EditText? by lazy { findViewById(R.id.et_short_id) }
+    private val container_short_id: LinearLayout? by lazy { findViewById(R.id.l7) }
+    private val et_spider_x: EditText? by lazy { findViewById(R.id.et_spider_x) }
+    private val container_spider_x: LinearLayout? by lazy { findViewById(R.id.l8) }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -105,6 +116,7 @@ class ServerActivity : BaseActivity() {
            EConfigType.SOCKS -> setContentView(R.layout.activity_server_socks)
            EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
            EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
+            else -> setContentView(R.layout.activity_server_vmess)
        }
        sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
@@ -126,6 +138,38 @@ class ServerActivity : BaseActivity() {
                // do nothing
            }
        }
+        sp_stream_security?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                if (streamSecuritys[position].isBlank()) {
+                    container_sni?.visibility = View.GONE
+                    container_fingerprint?.visibility = View.GONE
+                    container_alpn?.visibility = View.GONE
+                    container_allow_insecure?.visibility = View.GONE
+                    container_public_key?.visibility = View.GONE
+                    container_short_id?.visibility = View.GONE
+                    container_spider_x?.visibility = View.GONE
+                } else {
+                    container_sni?.visibility = View.VISIBLE
+                    container_fingerprint?.visibility = View.VISIBLE
+                    container_alpn?.visibility = View.VISIBLE
+                    if (streamSecuritys[position] == TLS) {
+                        container_allow_insecure?.visibility = View.VISIBLE
+                        container_public_key?.visibility = View.GONE
+                        container_short_id?.visibility = View.GONE
+                        container_spider_x?.visibility = View.GONE
+                    } else {
+                        container_allow_insecure?.visibility = View.GONE
+                        container_alpn?.visibility = View.GONE
+                        container_public_key?.visibility = View.VISIBLE
+                        container_short_id?.visibility = View.VISIBLE
+                        container_spider_x?.visibility = View.VISIBLE
+                    }
+                }
+            }
+            override fun onNothingSelected(p0: AdapterView<*>?) {
+                // do nothing
+            }
+        }
        if (config != null) {
            bindingServer(config)
        } else {
@@ -169,13 +213,11 @@ class ServerActivity : BaseActivity() {
        val streamSecurity = Utils.arrayFind(streamSecuritys, streamSetting.security)
        if (streamSecurity >= 0) {
            sp_stream_security?.setSelection(streamSecurity)
-            (streamSetting.tlsSettings?: streamSetting.xtlsSettings)?.let { tlsSetting ->
-                val allowinsecure = Utils.arrayFind(allowinsecures, tlsSetting.allowInsecure.toString())
-                if (allowinsecure >= 0) {
-                    sp_allow_insecure?.setSelection(allowinsecure)
-                }
+            (streamSetting.tlsSettings?: streamSetting.realitySettings)?.let { tlsSetting ->
+                container_sni?.visibility = View.VISIBLE
+                container_fingerprint?.visibility = View.VISIBLE
+                container_alpn?.visibility = View.VISIBLE
                et_sni?.text = Utils.getEditable(tlsSetting.serverName)
-
                tlsSetting.fingerprint?.let {
                    val utlsIndex = Utils.arrayFind(uTlsItems, tlsSetting.fingerprint)
                    sp_stream_fingerprint?.setSelection(utlsIndex)
@@ -184,7 +226,33 @@ class ServerActivity : BaseActivity() {
                    val alpnIndex = Utils.arrayFind(alpns, Utils.removeWhiteSpace(tlsSetting.alpn.joinToString())!!)
                    sp_stream_alpn?.setSelection(alpnIndex)
                }
-
+                if (streamSetting.tlsSettings != null) {
+                    container_allow_insecure?.visibility = View.VISIBLE
+                    val allowinsecure = Utils.arrayFind(allowinsecures, tlsSetting.allowInsecure.toString())
+                    if (allowinsecure >= 0) {
+                        sp_allow_insecure?.setSelection(allowinsecure)
+                    }
+                    container_public_key?.visibility = View.GONE
+                    container_short_id?.visibility = View.GONE
+                    container_spider_x?.visibility = View.GONE
+                } else { // reality settings
+                    container_public_key?.visibility = View.VISIBLE
+                    et_public_key?.text = Utils.getEditable(tlsSetting.publicKey.orEmpty())
+                    container_short_id?.visibility = View.VISIBLE
+                    et_short_id?.text = Utils.getEditable(tlsSetting.shortId.orEmpty())
+                    container_spider_x?.visibility = View.VISIBLE
+                    et_spider_x?.text = Utils.getEditable(tlsSetting.spiderX.orEmpty())
+                    container_allow_insecure?.visibility = View.GONE
+                }
+            }
+            if (streamSetting.tlsSettings == null && streamSetting.realitySettings == null) {
+                container_sni?.visibility = View.GONE
+                container_fingerprint?.visibility = View.GONE
+                container_alpn?.visibility = View.GONE
+                container_allow_insecure?.visibility = View.GONE
+                container_public_key?.visibility = View.GONE
+                container_short_id?.visibility = View.GONE
+                container_spider_x?.visibility = View.GONE
            }
        }
        val network = Utils.arrayFind(networks, streamSetting.network)
@@ -304,12 +372,6 @@ class ServerActivity : BaseActivity() {
            }
        } else if (config.configType == EConfigType.TROJAN) {
            server.password = et_id.text.toString().trim()
-            server.flow =
-                    if (streamSecuritys[sp_stream_security?.selectedItemPosition ?: 0] == V2rayConfig.XTLS) {
-                        flows[sp_flow?.selectedItemPosition ?: 0]
-                    } else {
-                        ""
-                    }
        }
    }

@@ -321,8 +383,11 @@ class ServerActivity : BaseActivity() {
        val sniField = et_sni?.text?.toString()?.trim() ?: return
        val allowInsecureField = sp_allow_insecure?.selectedItemPosition ?: return
        val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
-        var utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: return
-        var alpnIndex = sp_stream_alpn?.selectedItemPosition ?: return
+        val utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: return
+        val alpnIndex = sp_stream_alpn?.selectedItemPosition ?: return
+        val publicKey = et_public_key?.text?.toString()?.trim() ?: return
+        val shortId = et_short_id?.text?.toString()?.trim() ?: return
+        val spiderX = et_spider_x?.text?.toString()?.trim() ?: return

        var sni = streamSetting.populateTransportSettings(
                transport = networks[network],
@@ -344,18 +409,32 @@ class ServerActivity : BaseActivity() {
            allowinsecures[allowInsecureField].toBoolean()
        }

-        streamSetting.populateTlsSettings(streamSecuritys[streamSecurity], allowInsecure, sni, uTlsItems[utlsIndex], alpns[alpnIndex])
+        streamSetting.populateTlsSettings(
+                streamSecurity = streamSecuritys[streamSecurity],
+                allowInsecure = allowInsecure,
+                sni = sni,
+                fingerprint = uTlsItems[utlsIndex],
+                alpns = alpns[alpnIndex],
+                publicKey = publicKey,
+                shortId = shortId,
+                spiderX = spiderX
+        )
    }

    private fun transportTypes(network: String?): Array<out String> {
-        return if (network == "tcp") {
-            tcpTypes
-        } else if (network == "kcp" || network == "quic") {
-            kcpAndQuicTypes
-        } else if (network == "grpc") {
-            grpcModes
-        } else {
-            arrayOf("---")
+        return when (network) {
+            "tcp" -> {
+                tcpTypes
+            }
+            "kcp", "quic" -> {
+                kcpAndQuicTypes
+            }
+            "grpc" -> {
+                grpcModes
+            }
+            else -> {
+                arrayOf("---")
+            }
        }
    }

@@ -364,7 +443,7 @@ class ServerActivity : BaseActivity() {
     */
    private fun deleteServer(): Boolean {
        if (editGuid.isNotEmpty()) {
-            if (editGuid != mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
+            if (editGuid != mainStorage?.decodeString(KEY_SELECTED_SERVER)) {
                if (settingsStorage?.decodeBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
                    AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                        .setPositiveButton(android.R.string.ok) { _, _ ->
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/TaskerActivity.kt
@@ -11,7 +11,6 @@ import android.content.Intent
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
-import com.google.zxing.WriterException
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.databinding.ActivityTaskerBinding
@@ -65,7 +64,7 @@ class TaskerActivity : BaseActivity() {
                    listview?.setItemChecked(pos, true)
                }
            }
-        } catch (e: WriterException) {
+        } catch (e: Exception) {
            e.printStackTrace()

        }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UrlSchemeActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UrlSchemeActivity.kt
@@ -3,7 +3,6 @@ package com.v2ray.ang.ui
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.google.zxing.WriterException
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
@@ -44,7 +43,7 @@ class UrlSchemeActivity : BaseActivity() {
            }
            startActivity(Intent(this, MainActivity::class.java))
            finish()
-        } catch (e: WriterException) {
+        } catch (e: Exception) {
            e.printStackTrace()
        }
    }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.provider.OpenableColumns
 import android.util.Log
@@ -75,7 +76,14 @@ class UserAssetActivity : BaseActivity() {
    }

    private fun showFileChooser() {
-        RxPermissions(this).request(Manifest.permission.READ_EXTERNAL_STORAGE).subscribe {
+        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.READ_MEDIA_IMAGES
+        } else {
+            Manifest.permission.READ_EXTERNAL_STORAGE
+        }
+        RxPermissions(this)
+            .request(permission)
+            .subscribe {
            if (it) {
                val intent = Intent(Intent.ACTION_GET_CONTENT)
                intent.type = "*/*"
@@ -91,7 +99,8 @@ class UserAssetActivity : BaseActivity() {
                } catch (ex: android.content.ActivityNotFoundException) {
                    toast(R.string.toast_require_file_manager)
                }
-            }
+            } else
+                toast(R.string.toast_permission_denied)
        }
    }

--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
@@ -145,7 +145,7 @@ object AngConfigManager {
                    }
                    var fingerprint = streamSetting.tlsSettings?.fingerprint
                    streamSetting.populateTlsSettings(vmessBean.streamSecurity, allowInsecure,
-                        vmessBean.sni.ifBlank { sni }, fingerprint, null)
+                        vmessBean.sni.ifBlank { sni }, fingerprint, null, null, null, null)
                }
            }
            val key = MmkvManager.encodeServerConfig(vmessBean.guid, config)
@@ -186,8 +186,6 @@ object AngConfigManager {
                config = ServerConfig.create(EConfigType.VMESS)
                val streamSetting = config.outboundBean?.streamSettings ?: return -1

-                var fingerprint = streamSetting.tlsSettings?.fingerprint
-

                if (!tryParseNewVmess(str, config, allowInsecure)) {
                    if (str.indexOf("?") > 0) {
@@ -221,9 +219,10 @@ object AngConfigManager {
                        val sni = streamSetting.populateTransportSettings(vmessQRCode.net, vmessQRCode.type, vmessQRCode.host,
                                vmessQRCode.path, vmessQRCode.path, vmessQRCode.host, vmessQRCode.path, vmessQRCode.type, vmessQRCode.path)

-
+                        val fingerprint = vmessQRCode.fp ?: streamSetting.tlsSettings?.fingerprint
                        streamSetting.populateTlsSettings(vmessQRCode.tls, allowInsecure,
-                                if (TextUtils.isEmpty(vmessQRCode.sni)) sni else vmessQRCode.sni, fingerprint, vmessQRCode.alpn)
+                                if (TextUtils.isEmpty(vmessQRCode.sni)) sni else vmessQRCode.sni,
+                                fingerprint, vmessQRCode.alpn, null, null, null)
                    }
                }
            } else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
@@ -306,11 +305,14 @@ object AngConfigManager {
                    val sni = config.outboundBean?.streamSettings?.populateTransportSettings(queryParam["type"] ?: "tcp", queryParam["headerType"],
                        queryParam["host"], queryParam["path"], queryParam["seed"], queryParam["quicSecurity"], queryParam["key"],
                        queryParam["mode"], queryParam["serviceName"])
-                    config.outboundBean?.streamSettings?.populateTlsSettings(queryParam["security"] ?: TLS, allowInsecure, queryParam["sni"] ?: sni!!, fingerprint, queryParam["alpn"])
+                    fingerprint = queryParam["fp"] ?: ""
+                    config.outboundBean?.streamSettings?.populateTlsSettings(queryParam["security"] ?: TLS,
+                            allowInsecure, queryParam["sni"] ?: sni!!, fingerprint, queryParam["alpn"],
+                            null, null, null)
                    flow = queryParam["flow"] ?: ""
                } else {
-
-                    config.outboundBean?.streamSettings?.populateTlsSettings(TLS, allowInsecure, "", fingerprint, null)
+                    config.outboundBean?.streamSettings?.populateTlsSettings(TLS, allowInsecure, "",
+                            fingerprint, null, null, null, null)
                }

                config.outboundBean?.settings?.servers?.get(0)?.let { server ->
@@ -339,7 +341,12 @@ object AngConfigManager {
                val sni = streamSetting.populateTransportSettings(queryParam["type"] ?: "tcp", queryParam["headerType"],
                        queryParam["host"], queryParam["path"], queryParam["seed"], queryParam["quicSecurity"], queryParam["key"],
                        queryParam["mode"], queryParam["serviceName"])
-                streamSetting.populateTlsSettings(queryParam["security"] ?: "", allowInsecure, queryParam["sni"] ?: sni, fingerprint, queryParam["alpn"])
+                fingerprint = queryParam["fp"] ?: ""
+                val pbk = queryParam["pbk"] ?: ""
+                val sid = queryParam["sid"] ?: ""
+                val spx =  Utils.urlDecode(queryParam["spx"] ?: "")
+                streamSetting.populateTlsSettings(queryParam["security"] ?: "", allowInsecure,
+                        queryParam["sni"] ?: sni, fingerprint, queryParam["alpn"], pbk, sid, spx)
            }
            if (config == null){
                return R.string.toast_incorrect_protocol
@@ -384,7 +391,8 @@ object AngConfigManager {
                    queryParam["host"]?.split("|")?.get(0) ?: "",
                    queryParam["path"]?.takeIf { it.trim() != "/" } ?: "", queryParam["seed"], queryParam["security"],
                    queryParam["key"], queryParam["mode"], queryParam["serviceName"])
-            streamSetting.populateTlsSettings(if (tls) TLS else "", allowInsecure, sni, fingerprint, null)
+            streamSetting.populateTlsSettings(if (tls) TLS else "", allowInsecure, sni, fingerprint, null,
+                    null, null, null)
            true
        }.getOrElse { false }
    }
@@ -478,6 +486,7 @@ object AngConfigManager {
                    vmessQRCode.tls = streamSetting.security
                    vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
                    vmessQRCode.alpn = Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString()).orEmpty()
+                    vmessQRCode.fp = streamSetting.tlsSettings?.fingerprint.orEmpty()
                    outbound.getTransportSettingDetails()?.let { transportDetails ->
                        vmessQRCode.type = transportDetails[0]
                        vmessQRCode.host = transportDetails[1]
@@ -528,13 +537,25 @@ object AngConfigManager {
                    }

                    dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
-                    (streamSetting.tlsSettings?: streamSetting.xtlsSettings)?.let { tlsSetting ->
+                    (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!!
+                        }
+                        if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
+                            dicQuery["pbk"] = tlsSetting.publicKey!!
+                        }
+                        if (!TextUtils.isEmpty(tlsSetting.shortId)) {
+                            dicQuery["sid"] = tlsSetting.shortId!!
+                        }
+                        if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
+                            dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX!!)
+                        }
                    }
                    dicQuery["type"] = streamSetting.network.ifEmpty { V2rayConfig.DEFAULT_NETWORK }

@@ -649,7 +670,7 @@ object AngConfigManager {
            if (TextUtils.isEmpty(conf)) {
                return null
            }
-            return Utils.createQRCode(conf)
+            return QRCodeDecoder.createQRCode(conf)

        } catch (e: Exception) {
            e.printStackTrace()
@@ -735,6 +756,7 @@ object AngConfigManager {

            var count = 0
            servers.lines()
+                    .reversed()
                    .forEach {
                        val resId = importConfig(it, subid, removedSelectedServer)
                        if (resId == 0) {
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/MmkvManager.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/MmkvManager.kt
@@ -46,7 +46,7 @@ object MmkvManager {
        serverStorage?.encode(key, Gson().toJson(config))
        val serverList = decodeServerList()
        if (!serverList.contains(key)) {
-            serverList.add(key)
+            serverList.add(0, key)
            mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
            if (mainStorage?.decodeString(KEY_SELECTED_SERVER).isNullOrBlank()) {
                mainStorage?.encode(KEY_SELECTED_SERVER, key)
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/QRCodeDecoder.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/QRCodeDecoder.kt
@@ -5,6 +5,7 @@ import android.graphics.BitmapFactory
 import com.google.zxing.*
 import com.google.zxing.common.GlobalHistogramBinarizer
 import com.google.zxing.common.HybridBinarizer
+import com.google.zxing.qrcode.QRCodeWriter
 import java.util.*

 /**
@@ -13,6 +14,36 @@ import java.util.*
 object QRCodeDecoder {
    val HINTS: MutableMap<DecodeHintType, Any?> = EnumMap(DecodeHintType::class.java)

+    /**
+     * create qrcode using zxing
+     */
+    fun createQRCode(text: String, size: Int = 800): Bitmap? {
+        try {
+            val hints = HashMap<EncodeHintType, String>()
+            hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+            val bitMatrix = QRCodeWriter().encode(text,
+                BarcodeFormat.QR_CODE, size, size, hints)
+            val pixels = IntArray(size * size)
+            for (y in 0 until size) {
+                for (x in 0 until size) {
+                    if (bitMatrix.get(x, y)) {
+                        pixels[y * size + x] = 0xff000000.toInt()
+                    } else {
+                        pixels[y * size + x] = 0xffffffff.toInt()
+                    }
+
+                }
+            }
+            val bitmap = Bitmap.createBitmap(size, size,
+                Bitmap.Config.ARGB_8888)
+            bitmap.setPixels(pixels, 0, size, 0, 0, size, size)
+            return bitmap
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
+        }
+    }
+
    /**
     * 同步解析本地图片二维码。该方法是耗时操作，请在子线程中调用。
     *
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -4,13 +4,7 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.text.Editable
 import android.util.Base64
-import com.google.zxing.WriterException
-import android.graphics.Bitmap
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.qrcode.QRCodeWriter
-import com.google.zxing.EncodeHintType
 import java.util.*
-import kotlin.collections.HashMap
 import android.content.ClipData
 import android.content.Intent
 import android.content.res.Configuration.UI_MODE_NIGHT_MASK
@@ -171,36 +165,6 @@ object Utils {
        return ret
    }

-    /**
-     * create qrcode using zxing
-     */
-    fun createQRCode(text: String, size: Int = 800): Bitmap? {
-        try {
-            val hints = HashMap<EncodeHintType, String>()
-            hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-            val bitMatrix = QRCodeWriter().encode(text,
-                    BarcodeFormat.QR_CODE, size, size, hints)
-            val pixels = IntArray(size * size)
-            for (y in 0 until size) {
-                for (x in 0 until size) {
-                    if (bitMatrix.get(x, y)) {
-                        pixels[y * size + x] = 0xff000000.toInt()
-                    } else {
-                        pixels[y * size + x] = 0xffffffff.toInt()
-                    }
-
-                }
-            }
-            val bitmap = Bitmap.createBitmap(size, size,
-                    Bitmap.Config.ARGB_8888)
-            bitmap.setPixels(pixels, 0, size, 0, 0, size, size)
-            return bitmap
-        } catch (e: WriterException) {
-            e.printStackTrace()
-            return null
-        }
-    }
-
    /**
     * is ip address
     */
@@ -274,7 +238,7 @@ object Utils {
            if (value != null && Patterns.WEB_URL.matcher(value).matches() || URLUtil.isValidUrl(value)) {
                return true
            }
-        } catch (e: WriterException) {
+        } catch (e: Exception) {
            e.printStackTrace()
            return false
        }
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
@@ -151,7 +151,7 @@ object V2rayConfigUtil {

            v2rayConfig.routing.domainStrategy = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY)
                    ?: "IPIfNonMatch"
-            v2rayConfig.routing.domainMatcher = "mph"
+//            v2rayConfig.routing.domainMatcher = "mph"
            val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE) ?: ERoutingMode.GLOBAL_PROXY.value

            // Hardcode googleapis.cn
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
@@ -74,8 +74,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
        val key = MmkvManager.encodeServerConfig("", config)
        serverRawStorage?.encode(key, server)
-        serverList.add(key)
-        serversCache.add(ServersCache(key,config))
+        serverList.add(0, key)
+        serversCache.add(0, ServersCache(key,config))
    }

    fun swapServer(fromPosition: Int, toPosition: Int) {
@@ -201,6 +201,27 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        return -1
    }

+    fun removeDuplicateServer() {
+        val deleteServer = mutableListOf<String>()
+        serversCache.forEachIndexed { index, it ->
+            val outbound = it.config.getProxyOutbound()
+            serversCache.forEachIndexed { index2, it2 ->
+                if(index2 > index){
+                    val outbound2 = it2.config.getProxyOutbound()
+                    if( outbound == outbound2 && !deleteServer.contains(it2.guid))
+                    {
+                        deleteServer.add(it2.guid)
+                    }
+                }
+            }
+        }
+        for(it in deleteServer){
+            MmkvManager.removeServer(it)
+        }
+        reloadServerList()
+        getApplication<AngApplication>().toast(getApplication<AngApplication>().getString(R.string.title_del_duplicate_config_count, deleteServer.count()))
+    }
+
    private val mMsgReceiver = object : BroadcastReceiver() {
        override fun onReceive(ctx: Context?, intent: Intent?) {
            when (intent?.getIntExtra("key", 0)) {
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SettingsViewModel.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SettingsViewModel.kt
@@ -50,7 +50,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.PREF_PREFER_IPV6,
            AppConfig.PREF_PER_APP_PROXY,
            AppConfig.PREF_BYPASS_APPS,
-            AppConfig.PREF_CONFIRM_REMOVE, -> {
+            AppConfig.PREF_CONFIRM_REMOVE,
+            AppConfig.PREF_START_SCAN_IMMEDIATE, -> {
                settingsStorage?.encode(key, sharedPreferences.getBoolean(key, false))
            }
            AppConfig.PREF_SNIFFING_ENABLED -> {
--- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
@@ -98,24 +98,6 @@

        </LinearLayout>

-        <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_lab_flow" />
-
-            <Spinner
-                android:id="@+id/sp_flow"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
-                android:entries="@array/flows" />
-        </LinearLayout>
-
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
--- a/V2rayNG/app/src/main/res/layout/tls_layout.xml
+++ b/V2rayNG/app/src/main/res/layout/tls_layout.xml
@@ -104,5 +104,64 @@
            android:layout_height="@dimen/edit_height"
            android:entries="@array/allowinsecures" />
    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/l6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:orientation="vertical">

+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_public_key" />
+
+        <EditText
+            android:id="@+id/et_public_key"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edit_height"
+            android:inputType="text"
+            android:nextFocusDown="@+id/sp_stream_fingerprint" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/l7"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_short_id" />
+
+        <EditText
+            android:id="@+id/et_short_id"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edit_height"
+            android:inputType="text"
+            android:nextFocusDown="@+id/sp_stream_fingerprint" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/l8"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_spider_x" />
+
+        <EditText
+            android:id="@+id/et_spider_x"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edit_height"
+            android:inputType="text"
+            android:nextFocusDown="@+id/sp_stream_fingerprint" />
+
+    </LinearLayout>
 </LinearLayout>
--- a/V2rayNG/app/src/main/res/menu/menu_main.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_main.xml
@@ -73,6 +73,11 @@
        android:icon="@drawable/ic_delete_white_24dp"
        android:title="@string/title_del_all_config"
        app:showAsAction="never" />
+    <item
+        android:id="@+id/del_duplicate_config"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/title_del_duplicate_config"
+        app:showAsAction="never" />
    <item
        android:id="@+id/del_invalid_config"
        android:icon="@drawable/ic_delete_white_24dp"
--- a/V2rayNG/app/src/main/res/menu/menu_scanner.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_scanner.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/scan_code"
+        android:icon="@drawable/ic_scan_black_24dp"
+        android:title=""
+        app:showAsAction="always" />
    <item
        android:id="@+id/select_photo"
        android:icon="@drawable/ic_image_photo"
--- a/V2rayNG/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/V2rayNG/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -48,9 +48,7 @@
    <string name="server_lab_mode_type">حالت gRPC</string>
    <string name="server_lab_request_host">درخواست میزبان (میزبان/میزبان ws/ میزبان h2)/امنیت QUIC</string>
    <string name="server_lab_path">مسیر (مسیر ws/ مسیر h2) کلید QUIC/دانه kcp/نام‌خدمات gRPC</string>
-    <string name="server_lab_stream_security">tls</string>
-    <string name="server_lab_stream_fingerprint" translatable="false">uTLS</string>
-    <string name="server_lab_stream_alpn" translatable="false">alpn</string>
+    <string name="server_lab_stream_security">TLS</string>
    <string name="server_lab_allow_insecure">allowInsecure</string>
    <string name="server_lab_sni">SNI</string>
    <string name="server_lab_address3">نشانی</string>
@@ -149,6 +147,9 @@
    <string name="title_pref_confirm_remove">تایید حذف پرونده پیکربندی</string>
    <string name="summary_pref_confirm_remove">آیا برای حذف پرونده پیکربندی نیاز به تایید دوم توسط کاربر است</string>

+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
    <string name="title_pref_feedback">بازخورد</string>
    <string name="summary_pref_feedback">بهبودهای بازخورد یا اشکالات در گیت‌هاب</string>
    <string name="summary_pref_tg_group">عضویت در گروه تلگرام</string>
@@ -161,12 +162,14 @@
    <string name="title_mode">حالت</string>
    <string name="title_mode_help">برای راهنمایی بیشتر روی این متن، کلیک کنید</string>
    <string name="title_language">زبان</string>
+    <string name="title_ui_settings">UI settings</string>

    <string name="title_logcat">گزارشات</string>
    <string name="logcat_copy">کپی</string>
    <string name="logcat_clear">پاک کردن</string>
    <string name="title_service_restart">راه‌اندازی مجدد خدمات</string>
    <string name="title_del_all_config">حذف تمام پیکربندی</string>
+    <string name="title_del_duplicate_config">Delete duplicate config</string>
    <string name="title_del_invalid_config">تنظیمات نامعتبر را حذف کنید (ابتدا آزمایش کنید)</string>
    <string name="title_export_all">خروجی گرفتن پیکربندی‌های غیرسفارشی در کلیپ‌بورد</string>
    <string name="title_sub_setting">تنظیمات گروه‌ی اشتراک</string>
@@ -180,6 +183,7 @@
    <string name="title_sort_by_test_results">مرتب‌سازی بر اساس نتایج آزمایش</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>

    <string name="tasker_start_service">شروع خدمات</string>
    <string name="tasker_setting_confirm">تایید</string>
--- a/V2rayNG/app/src/main/res/values-night/colors.xml
+++ b/V2rayNG/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorAccent">#12976F</color>
+    <color name="colorBg">#252525</color>
+    <color name="colorText">#CCCCCC</color>
+</resources>
--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -49,8 +49,8 @@
    <string name="server_lab_request_host">Запрос узла (WS/H2) / Шифрование QUIC</string>
    <string name="server_lab_path">Путь (WS/H2) / Ключ QUIC / Сид KCP / Сервис gRPC</string>
    <string name="server_lab_stream_security">TLS</string>
-    <string name="server_lab_stream_fingerprint">uTLS</string>
-    <string name="server_lab_stream_alpn" translatable="false">alpn</string>
+    <string name="server_lab_stream_fingerprint" translatable="false">Fingerprint</string>
+    <string name="server_lab_stream_alpn" translatable="false">Alpn</string>
    <string name="server_lab_allow_insecure">Разрешать небезопасные</string>
    <string name="server_lab_sni">SNI</string>
    <string name="server_lab_address3">Адрес</string>
@@ -61,6 +61,9 @@
    <string name="server_lab_security4">Пользователь (необязательно)</string>
    <string name="server_lab_encryption">Шифрование</string>
    <string name="server_lab_flow">Поток</string>
+    <string name="server_lab_public_key" translatable="false">PublicKey</string>
+    <string name="server_lab_short_id" translatable="false">ShortId</string>
+    <string name="server_lab_spider_x" translatable="false">SpiderX</string>
    <string name="toast_success">Успешно</string>
    <string name="toast_failure">Ошибка</string>
    <string name="toast_none_data">Ничего нет</string>
@@ -149,6 +152,9 @@
    <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>
+
    <string name="title_pref_feedback">Обратная связь</string>
    <string name="summary_pref_feedback">Предложить улучшение или сообщить об ошибке на GitHub</string>
    <string name="summary_pref_tg_group">Присоединиться к группе в Telegram</string>
@@ -161,12 +167,14 @@
    <string name="title_mode">Режим</string>
    <string name="title_mode_help">Нажмите для получения дополнительной информации</string>
    <string name="title_language">Язык</string>
+    <string name="title_ui_settings">Настройки интерфейса</string>

    <string name="title_logcat">Системный журнал</string>
    <string name="logcat_copy">Копировать</string>
    <string name="logcat_clear">Очистить</string>
    <string name="title_service_restart">Перезапуск службы</string>
    <string name="title_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>
@@ -180,6 +188,7 @@
    <string name="title_sort_by_test_results">Сортировка по результатам теста</string>
    <string name="title_filter_config">Фильтр профилей</string>
    <string name="filter_config_all">Все группы</string>
+    <string name="title_del_duplicate_config_count">Удалено дубликатов профилей: %d</string>

    <string name="tasker_start_service">Запуск службы</string>
    <string name="tasker_setting_confirm">Подтвердить</string>
--- a/V2rayNG/app/src/main/res/values-vi/strings.xml
+++ b/V2rayNG/app/src/main/res/values-vi/strings.xml
@@ -2,78 +2,78 @@
 <resources>
    <string name="app_widget_name">Kết nối ngay</string>
    <string name="app_tile_name">Kết nối ngay</string>
-    <string name="app_tile_first_use">Vui lòng thêm một cấu hình vào v2rayNG để sử dụng.</string>
-    <string name="navigation_drawer_open">Mở menu ứng dụng</string>
-    <string name="navigation_drawer_close">Đóng menu ứng dụng</string>
+    <string name="app_tile_first_use">Vui lòng thêm một cấu hình vào v2rayNG để sử dụng!</string>
+    <string name="navigation_drawer_open">Mở Menu ứng dụng</string>
+    <string name="navigation_drawer_close">Đóng Menu ứng dụng</string>
    <string name="migration_success">Đã chuyển dữ liệu!</string>
    <string name="migration_fail">Không thể chuyển dữ liệu!</string>

    <!-- Notifications -->
    <string name="notification_action_stop_v2ray">Ngắt kết nối v2rayNG</string>
-    <string name="toast_permission_denied">Vui lòng cấp quyền cần thiết cho v2rayNG. Bạn đã từ chối các quyền cần thiết như Camera hay Bộ nhớ.</string>
+    <string name="toast_permission_denied">Vui lòng cấp quyền cần thiết cho v2rayNG! Bạn đã từ chối các quyền cần thiết như Camera hay Bộ nhớ?</string>
    <string name="notification_action_more">Nhấn để biết thêm</string>
-    <string name="toast_services_start">Đang bắt đầu dịch vụ v2rayNG.</string>
-    <string name="toast_services_stop">Đã dừng dịch vụ v2rayNG.</string>
-    <string name="toast_services_success">Đã bắt đầu dịch vụ v2rayNG.</string>
-    <string name="toast_services_failure">Không thể bắt đầu dịch vụ, hãy thử kiểm tra lại cấu hình hoặc khởi động lại thiết bị.</string>
+    <string name="toast_services_start">Đang bắt đầu v2rayNG...</string>
+    <string name="toast_services_stop">Đã dừng v2rayNG!</string>
+    <string name="toast_services_success">Đã bắt đầu v2rayNG!</string>
+    <string name="toast_services_failure">Không thể bắt đầu v2rayNG, kiểm tra lại cấu hình hoặc khởi động lại thiết bị.</string>

    <!--ServerActivity-->
-    <string name="title_server">V2RayNG App :3</string>
+    <string name="title_server">v2rayNG</string>
    <string name="menu_item_add_config">Thêm cấu hình</string>
    <string name="menu_item_save_config">Lưu cấu hình</string>
    <string name="menu_item_del_config">Xoá cấu hình</string>
    <string name="menu_item_import_config_qrcode">Nhập cấu hình từ mã QR</string>
-    <string name="menu_item_import_config_clipboard">Nhập cấu hình từ bộ nhớ tạm thời</string>
+    <string name="menu_item_import_config_clipboard">Nhập cấu hình từ Clipboard</string>
    <string name="menu_item_import_config_manually_vmess">Nhập thủ công [Vmess]</string>
    <string name="menu_item_import_config_manually_vless">Nhập thủ công [VLESS]</string>
    <string name="menu_item_import_config_manually_ss">Nhập thủ công [Shadowsocks]</string>
    <string name="menu_item_import_config_manually_socks">Nhập thủ công [Socks]</string>
    <string name="menu_item_import_config_manually_trojan">Nhập thủ công [Trojan]</string>
    <string name="menu_item_import_config_custom">Nâng cao / Cấu hình tùy chỉnh</string>
-    <string name="menu_item_import_config_custom_clipboard">Nhập cấu hình tùy chỉnh từ bộ nhớ tạm thời</string>
+    <string name="menu_item_import_config_custom_clipboard">Nhập cấu hình tùy chỉnh từ Clipboard</string>
    <string name="menu_item_import_config_custom_local">Nhập cấu hình tùy chỉnh từ Tệp</string>
    <string name="menu_item_import_config_custom_url">Nhập cấu hình tùy chỉnh từ URL</string>
    <string name="menu_item_import_config_custom_url_scan">Nhập cấu hình tùy chỉnh quét URL</string>
-    <string name="del_config_comfirm">Bạn có muốn xóa cấu hình ?</string>
+    <string name="del_config_comfirm">Bạn có muốn xóa cấu hình không?</string>
    <string name="server_lab_remarks">Tên cấu hình</string>
    <string name="server_lab_address">Địa chỉ</string>
    <string name="server_lab_port">Cổng</string>
-    <string name="server_lab_id">Địa chỉ ID</string>
-    <string name="server_lab_alterid">alterId</string>
+    <string name="server_lab_id">ID</string>
+    <string name="server_lab_alterid">ID thay thế</string>
    <string name="server_lab_security">Bảo mật</string>
    <string name="server_lab_network">Kiểu kết nối</string>
    <string name="server_lab_more_function">Nâng cao</string>
-    <string name="server_lab_head_type">Kiểu Head</string>
+    <string name="server_lab_head_type">Loại Head</string>
    <string name="server_lab_mode_type">Chế độ gRPC</string>
-    <string name="server_lab_request_host">Yêu cầu host(host/ws host/h2 host)/Bảo mật QUIC</string>
-    <string name="server_lab_path">Đường dẫn (ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName</string>
-    <string name="server_lab_stream_security">tls</string>
-    <string name="server_lab_allow_insecure">allowInsecure</string>
+    <string name="server_lab_request_host">Yêu cầu host (Host/WS/H2) / Bảo mật QUIC</string>
+    <string name="server_lab_path">Đường dẫn (WS/H2) / Khóa QUIC / KCP seed / Dịch vụ gRPC</string>
+    <string name="server_lab_stream_security">TLS</string>
+    <string name="server_lab_allow_insecure">Bỏ qua xác minh chứng chỉ</string>
    <string name="server_lab_sni">Địa chỉ SNI</string>
    <string name="server_lab_address3">Địa chỉ</string>
    <string name="server_lab_port3">Cổng</string>
    <string name="server_lab_id3">Mật khẩu</string>
    <string name="server_lab_security3">Bảo mật</string>
-    <string name="server_lab_id4">Mật khẩu(Bổ sung)</string>
-    <string name="server_lab_security4">Tên người dùng(Bổ sung)</string>
+    <string name="server_lab_id4">Mật khẩu (Bổ sung)</string>
+    <string name="server_lab_security4">Tên người dùng (Bổ sung)</string>
    <string name="server_lab_encryption">Mã hoá</string>
-    <string name="server_lab_flow">flow</string>
-    <string name="toast_success">Đã thực hiện thành công thao tác của bạn, Nếu có gì đó không ổn, hãy thao tác lại.</string>
-    <string name="toast_failure">Đã xảy ra lỗi, hãy thử kiểm tra lại hoặc thử lại.</string>
+    <string name="server_lab_flow">Kiểm soát lưu lượng</string>
+    <string name="toast_success">Thành công!</string>
+    <string name="toast_failure">Đã xảy ra lỗi, vui lòng thử lại!</string>
    <string name="toast_none_data">Không có gì ở đây</string>
-    <string name="toast_incorrect_protocol">Không đúng protocol</string>
-    <string name="toast_decoding_failed">Không thể decode</string>
-    <string name="title_file_chooser">Vui lòng chọn tệp cấu hình</string>
-    <string name="toast_require_file_manager">Vui lòng cài đặt trình quản lý tệp để tiếp tục.</string>
+    <string name="toast_incorrect_protocol">Không đúng Protocol</string>
+    <string name="toast_decoding_failed">Không thể giải mã</string>
+    <string name="title_file_chooser">Vui lòng chọn tệp cấu hình!</string>
+    <string name="toast_require_file_manager">Vui lòng cài đặt trình quản lý tệp để tiếp tục!</string>
    <string name="server_customize_config">Cấu hình tùy chỉnh</string>
-    <string name="toast_config_file_invalid">Cấu hình không hợp lệ</string>
+    <string name="toast_config_file_invalid">Cấu hình không hợp lệ!</string>
    <string name="server_lab_content">Nội dung</string>
-    <string name="toast_none_data_clipboard">Không có dữ liệu nào trong bộ nhớ tạm thời</string>
-    <string name="toast_invalid_url">URL không hợp lệ hoặc không có gì</string>
-    <string name="server_lab_need_inbound">Vui lòng đảm bảo cấu hình tùy chỉnh này không bị lỗi trước khi sử dụng. v2rayNG được Dịch Tiếng Việt bởi CuynuTT😘</string>
-    <string name="toast_malformed_josn">Cấu hình không hợp lệ </string>
-    <string name="server_lab_request_host6">Host(SNI)(Bổ sung)</string>
-    <string name="toast_asset_copy_failed">Không thể sao chép tệp tin, hãy dùng trình quản lý tệp</string>
+    <string name="toast_none_data_clipboard">Không có dữ liệu nào trong Clipboard!</string>
+    <string name="toast_invalid_url">URL không hợp lệ hoặc trống!</string>
+    <string name="server_lab_need_inbound">Vui lòng đảm bảo cấu hình tùy chỉnh này không bị lỗi trước khi sử dụng!</string>
+    <string name="toast_malformed_josn">Cấu hình không hợp lệ!</string>
+    <string name="server_lab_request_host6">Host (SNI) (Bổ sung)</string>
+    <string name="toast_asset_copy_failed">Không thể sao chép tệp tin, hãy dùng trình quản lý tệp!</string>
    <string name="menu_item_add_file">Thêm tệp</string>
    <string name="menu_item_download_file">Tải xuống tệp tin</string>

@@ -86,15 +86,15 @@
    <string name="menu_item_select_proxy_app">Tự động chọn ứng dụng Proxy</string>
    <string name="msg_downloading_content">Đang tải xuống nội dung...</string>
    <string name="menu_item_export_proxy_app">Xuất và sao chép</string>
-    <string name="menu_item_import_proxy_app">Nhập từ bộ nhớ tạm thời</string>
+    <string name="menu_item_import_proxy_app">Nhập từ Clipboard</string>


    <!-- Preferences -->
    <string name="title_settings">Cài đặt</string>
    <string name="title_advanced">Cài đặt nâng cao</string>
-    <string name="title_vpn_settings">Cài đặt cho VPN</string>
-    <string name="title_pref_per_app_proxy">Proxy cho ứng dụng</string>
-    <string name="summary_pref_per_app_proxy">Chung: Ứng dụng đã chọn sẽ kết nối Proxy, Chưa lựa chọn sẽ kết nối trực tiếp; \nBỏ qua kết nối: Ứng dụng được chọn sẽ trực tiếp kết nối, không lựa chọn Proxy. \nLựa chọn để tự động chọn ứng dụng Proxy trong Menu.</string>
+    <string name="title_vpn_settings">Cài đặt VPN</string>
+    <string name="title_pref_per_app_proxy">Proxy ứng dụng</string>
+    <string name="summary_pref_per_app_proxy">- Chung: Ứng dụng đã chọn sẽ kết nối Proxy, chưa lựa chọn sẽ kết nối trực tiếp. \n- Bỏ qua kết nối: Ứng dụng được chọn sẽ trực tiếp kết nối, không lựa chọn sẽ kết nối qua Proxy. \n- Lựa chọn để tự động chọn ứng dụng Proxy trong Menu.</string>

    <string name="title_pref_mux_enabled">Cho phép Mux</string>
    <string name="summary_pref_mux_enabled">Bật lên có thể làm tăng tốc độ mạng và chuyển mạng nhanh hơn.</string>
@@ -102,16 +102,14 @@
    <string name="title_pref_speed_enabled">Cho phép hiển thị tốc độ mạng</string>
    <string name="summary_pref_speed_enabled">Hiển thị tốc độ mạng hiện tại trên thanh thông báo.\nBiểu tượng trên thanh trạng thái có thể thay đổi tùy vào mức sử dụng.</string>

-    <string name="title_pref_sniffing_enabled">Cho phép Sniffing</string>
-    <string name="summary_pref_sniffing_enabled">Thử chuyển kết nối hiện tại của bạn qua trung gian để trung gian xử lý kết nối về lại cho bạn (Mặc định là bật, hãy tắt nó nếu kết nối không ổn định.)</string>
+    <string name="title_pref_sniffing_enabled">Bật tính năng phát hiện luồng</string>
+    <string name="summary_pref_sniffing_enabled">Thử chuyển kết nối hiện tại của bạn qua trung gian để trung gian xử lý kết nối về lại cho bạn. (Mặc định là bật, hãy tắt nó nếu kết nối không ổn định)</string>

    <string name="title_pref_local_dns_enabled">Cho phép DNS cục bộ</string>
-    <string name="summary_pref_local_dns_enabled">DNS được xử lý bởi mô đun của lõi DNS.
-(Khuyến cáo, nếu cần lộ trình Bẻ khoá LAN và
-        địa chỉ mainland)</string>
+    <string name="summary_pref_local_dns_enabled">DNS được xử lý bởi mô đun của lõi DNS. (Khuyến nghị, nếu cần định tuyến Bỏ qua mạng LAN và địa chỉ đất liền)</string>

    <string name="title_pref_fake_dns_enabled">Cho phép DNS giả</string>
-    <string name="summary_pref_fake_dns_enabled">DNS cục bộ trả về địa chỉ IP giả (Nhanh hơn, nhưng có thể không hoạt động với một số ứng dụng)</string>
+    <string name="summary_pref_fake_dns_enabled">DNS cục bộ trả về địa chỉ IP giả. (Nhanh hơn, nhưng có thể không hoạt động với một số ứng dụng)</string>

    <string name="title_pref_prefer_ipv6">Ưu tiên IPv6</string>
    <string name="summary_pref_prefer_ipv6">Ưu tiên sử dụng địa chỉ IPv6 cho kết nối và lộ trình.</string>
@@ -124,17 +122,17 @@
    <string name="title_pref_remote_dns">Điều khiển DNS (Bổ sung)</string>
    <string name="summary_pref_remote_dns">DNS</string>

-    <string name="title_pref_vpn_dns">VPN DNS (Chỉ IPv4/v6)</string>
+    <string name="title_pref_vpn_dns">VPN DNS (Chỉ IPv4/IPv6)</string>

-    <string name="title_pref_domestic_dns">Domestic DNS (Bổ sung)</string>
+    <string name="title_pref_domestic_dns">DNS trong nước (Bổ sung)</string>
    <string name="summary_pref_domestic_dns">DNS</string>

    <string name="title_pref_proxy_sharing_enabled">Cho phép kết nối từ mạng LAN</string>
-    <string name="summary_pref_proxy_sharing_enabled">Các thiết bị khác có thể kết nối đến proxy bởi địa chỉ IP thông qua socks/http, Chỉ bật khi bạn tin tưởng kết nối để tránh kết nối lạ.</string>
-    <string name="toast_warning_pref_proxysharing_short">Cho phép kết nối từ mạng LAN, Đảm bảo rằng bạn tin tưởng kết nối hiện tại.</string>
+    <string name="summary_pref_proxy_sharing_enabled">Các thiết bị khác có thể kết nối đến Proxy bởi địa chỉ IP thông qua Socks/HTTP, chỉ bật khi bạn tin tưởng kết nối đó.</string>
+    <string name="toast_warning_pref_proxysharing_short">Cho phép kết nối từ mạng LAN, đảm bảo rằng bạn tin tưởng kết nối hiện tại!</string>

-    <string name="title_pref_allow_insecure">Cho phép đặt lại allowInsecure</string>
-    <string name="summary_pref_allow_insecure">Khi kết nối TLS, đặt cài đặt allowInsecure thành mặc định</string>
+    <string name="title_pref_allow_insecure">Cho phép đặt lại Bỏ qua xác minh chứng chỉ</string>
+    <string name="summary_pref_allow_insecure">Khi kết nối TLS, đặt cài đặt Bỏ qua xác minh chứng chỉ thành mặc định.</string>

    <string name="title_pref_socks_port">Cổng Proxy SOCKS5</string>
    <string name="summary_pref_socks_port">Cổng Proxy SOCKS5</string>
@@ -148,24 +146,29 @@
    <string name="title_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình</string>
    <string name="summary_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình khi bạn xoá một cấu hình.</string>

+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
    <string name="title_pref_feedback">Phản hồi lỗi</string>
-    <string name="summary_pref_feedback">Phản hồi cải tiến hoặc bug lên GitHub</string>
+    <string name="summary_pref_feedback">Phản hồi cải tiến hoặc lỗi lên GitHub</string>
    <string name="summary_pref_tg_group">Tham gia nhóm Telegram</string>
    <string name="toast_tg_app_not_found">Không tìm thấy ứng dụng Telegram</string>

    <string name="title_pref_promotion">Quảng cáo Server</string>
-    <string name="summary_pref_promotion">Quảng cáo,nhấn để biết thêm(Ủng hộ có thể được gỡ bỏ)</string>
+    <string name="summary_pref_promotion">Quảng cáo, nhấn để biết thêm (Ủng hộ có thể được gỡ bỏ)</string>

    <string name="title_core_loglevel">Mức độ nhật ký</string>
    <string name="title_mode">Chế độ kết nối</string>
-    <string name="title_mode_help">Nhấn vào đây nếu bạn cần trợ giúp</string>
-    <string name="title_language">Ngôn ngữ ứng dụng</string>
+    <string name="title_mode_help">Nhấn vào đây nếu bạn cần trợ giúp!</string>
+    <string name="title_language">Ngôn ngữ</string>
+    <string name="title_ui_settings">UI settings</string>

    <string name="title_logcat">Nhật ký hoạt động</string>
    <string name="logcat_copy">Sao chép nhật ký</string>
    <string name="logcat_clear">Xoá nhật ký</string>
    <string name="title_service_restart">Kết nối lại v2rayNG</string>
    <string name="title_del_all_config">Xoá tất cả cấu hình</string>
+    <string name="title_del_duplicate_config">Delete duplicate config</string>
    <string name="title_del_invalid_config">Xoá cấu hình lỗi (Kiểm tra trước)</string>
    <string name="title_export_all">Xuất và sao chép tất cả cấu hình</string>
    <string name="title_sub_setting">Các gói đăng ký</string>
@@ -175,30 +178,31 @@
    <string name="title_sub_update">Cập nhật các gói đăng ký</string>
    <string name="title_ping_all_server">Ping tất cả máy chủ</string>
    <string name="title_real_ping_all_server">Kiểm tra máy chủ</string>
-    <string name="title_user_asset_setting">Tệp Geo assets</string>
+    <string name="title_user_asset_setting">Tệp Geo asset</string>
    <string name="title_sort_by_test_results">Sắp xếp lại theo lần kiểm tra cuối cùng</string>
    <string name="title_filter_config">Lọc cấu hình theo các gói đăng ký</string>
    <string name="filter_config_all">Hiển thị tất cả các gói đăng ký</string>
+    <string name="title_del_duplicate_config_count">Delete %d duplicate configurations</string>

-    <string name="tasker_start_service">Bắt đầu dịch vụ</string>
+    <string name="tasker_start_service">Bắt đầu v2rayNG</string>
    <string name="tasker_setting_confirm">Xác nhận</string>

    <string name="routing_settings_title">Cài đặt lộ trình</string>
-    <string name="routing_settings_tips">Được phân cách bằng dấu chấm phẩy(,),Hãy nhớ nó để lưu lại.</string>
+    <string name="routing_settings_tips">Được phân cách bằng dấu phẩy (,). Hãy nhớ nó để lưu lại!</string>
    <string name="routing_settings_save">Lưu lại</string>
    <string name="routing_settings_delete">Xoá</string>
-    <string name="routing_settings_scan_replace">Dò và thay thế</string>
-    <string name="routing_settings_scan_append">Dò và nối</string>
-    <string name="routing_settings_default_rules">Đặt luật lệ lộ trình mặc định</string>
+    <string name="routing_settings_scan_replace">Quét và thay thế</string>
+    <string name="routing_settings_scan_append">Quét và nối</string>
+    <string name="routing_settings_default_rules">Đặt luật cho lộ trình mặc định</string>

    <string name="connection_test_pending">Kiểm tra kết nối</string>
-    <string name="connection_test_testing">Đang kiểm tra kết nối mạng…</string>
-    <string name="connection_test_available">Đã kiểm tra kết nối mạng thành công, Ping hiện tại là %d</string>
-    <string name="connection_test_error">Lỗi kết nối mạng hãy thử đổi cấu hình hoặc kiểm tra lại. Mã lỗi: %s</string>
-    <string name="connection_test_fail">Không có kết nối mạng</string>
+    <string name="connection_test_testing">Đang kiểm tra kết nối mạng...</string>
+    <string name="connection_test_available">Kiểm tra kết nối mạng thành công! Ping hiện tại là %d</string>
+    <string name="connection_test_error">Lỗi kết nối mạng, hãy thử đổi cấu hình hoặc kiểm tra lại! Mã lỗi: %s</string>
+    <string name="connection_test_fail">Không có kết nối mạng!</string>
    <string name="connection_test_error_status_code">Mã lỗi: #%d</string>
-    <string name="connection_connected">Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng.</string>
-    <string name="connection_not_connected">Chưa kết nối, hãy thêm một cấu hình để kết nối. Đừng để bị lừa đảo bởi cấu hình mất tiền,Dịch TV bởi CuynuTT😘</string>
+    <string name="connection_connected">Đã kết nối, hãy nhấn vào đây để kiểm tra kết nối mạng!</string>
+    <string name="connection_not_connected">Chưa kết nối, hãy chọn một cấu hình để kết nối!</string>

    <string-array name="share_method">
        <item>Xuất ra mã QR (Chụp màn hình để lưu)</item>
@@ -207,17 +211,17 @@
    </string-array>

    <string-array name="routing_tag">
-        <item>proxy URL hoặc IP</item>
-        <item>direct URL hoặc IP</item>
+        <item>Proxy URL hoặc IP</item>
+        <item>Direct URL hoặc IP</item>
        <item>URL đã chặn hoặc IP</item>
    </string-array>

    <string-array name="routing_mode">
-        <item>Proxy Global</item>
-        <item>Bẻ khoá địa chỉ LAN rồi proxy</item>
-        <item>Bẻ khoá địa chỉ mainland rồi proxy</item>
-        <item>Bẻ khoá LAN và địa chỉ mainland rồi proxy</item>
-        <item>Trực tiếp Global</item>
+        <item>Proxy toàn cầu</item>
+        <item>Bỏ qua địa chỉ LAN rồi Proxy</item>
+        <item>Bỏ qua địa chỉ đất liền rồi Proxy</item>
+        <item>Bỏ qua LAN và địa chỉ đất liền rồi Proxy</item>
+        <item>Kết nối trực tiếp toàn cầu</item>
    </string-array>

    <string-array name="mode_entries">
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -44,10 +44,10 @@
    <string name="server_lab_network">传输协议(network)</string>
    <string name="server_lab_more_function">底层传输方式(transport)</string>
    <string name="server_lab_head_type">伪装类型(type)</string>
-    <string name="server_lab_mode_type">gRPC 传输模式 (mode)</string>
+    <string name="server_lab_mode_type">gRPC 传输模式(mode)</string>
    <string name="server_lab_request_host">伪装域名(host)(host/ws host/h2 host)/QUIC 加密方式</string>
    <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密密钥/kcp seed/gRPC serviceName</string>
-    <string name="server_lab_stream_security">传输层安全(tls)</string>
+    <string name="server_lab_stream_security">传输层安全(TLS)</string>
    <string name="server_lab_allow_insecure">跳过证书验证(allowInsecure)</string>
    <string name="server_lab_sni">SNI</string>
    <string name="server_lab_address3">服务器地址</string>
@@ -56,7 +56,7 @@
    <string name="server_lab_security3">加密方式</string>
    <string name="server_lab_id4">密码(可选)</string>
    <string name="server_lab_security4">用户名(可选)</string>
-    <string name="server_lab_encryption">加密(encryption)</string>
+    <string name="server_lab_encryption">加密方式(encryption)</string>
    <string name="server_lab_flow">流控(flow)</string>
    <string name="toast_success">成功</string>
    <string name="toast_failure">失败</string>
@@ -146,6 +146,9 @@
    <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>
+
    <string name="title_pref_feedback">反馈</string>
    <string name="summary_pref_feedback">反馈改进或漏洞至 GitHub</string>
    <string name="summary_pref_tg_group">加入Telegram Group</string>
@@ -158,12 +161,14 @@
    <string name="title_mode">模式</string>
    <string name="title_mode_help">点此查看更多帮助</string>
    <string name="title_language">语言</string>
+    <string name="title_ui_settings">用户界面设置</string>

    <string name="title_logcat">Logcat</string>
    <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_sub_setting">订阅分组设置</string>
@@ -177,6 +182,7 @@
    <string name="title_sort_by_test_results">按测试结果排序</string>
    <string name="title_filter_config">过滤配置文件</string>
    <string name="filter_config_all">所有订阅分组</string>
+    <string name="title_del_duplicate_config_count">删除 %d 个重复配置</string>

    <string name="tasker_start_service">启动服务</string>
    <string name="tasker_setting_confirm">确定</string>
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -47,7 +47,7 @@
    <string name="server_lab_mode_type">gRPC 傳輸模式 (mode)</string>
    <string name="server_lab_request_host">要求主機 (host)(host/ws host/h2 host)/QUIC 加密方式</string>
    <string name="server_lab_path">path(ws path/h2 path)/QUIC 加密金鑰/kcp seed/gRPC serviceName</string>
-    <string name="server_lab_stream_security">傳輸層安全 (tls)</string>
+    <string name="server_lab_stream_security">傳輸層安全 (TLS)</string>
    <string name="server_lab_allow_insecure">跳過憑證驗證 (allowInsecure)</string>
    <string name="server_lab_sni">SNI</string>
    <string name="server_lab_address3">伺服器位址</string>
@@ -146,6 +146,9 @@
    <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>
+
    <string name="title_pref_feedback">意見回饋</string>
    <string name="summary_pref_feedback">前往 GitHub 回報錯誤</string>
    <string name="summary_pref_tg_group">加入 Telegram 群組</string>
@@ -158,12 +161,14 @@
    <string name="title_mode">模式</string>
    <string name="title_mode_help">輕觸以檢視說明</string>
    <string name="title_language">語言</string>
+    <string name="title_ui_settings">用戶界面設置</string>

    <string name="title_logcat">Logcat</string>
    <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_sub_setting">訂閱分組設定</string>
@@ -177,6 +182,7 @@
    <string name="title_sort_by_test_results">依偵測結果排序</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>

    <string name="tasker_start_service">啟動服務</string>
    <string name="tasker_setting_confirm">確定</string>
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -57,7 +57,7 @@
    <string-array name="streamsecurityxs" translatable="false">
        <item></item>
        <item>tls</item>
-        <item>xtls</item>
+        <item>reality</item>
    </string-array>

    <string-array name="streamsecurity_utls" translatable="false">
@@ -65,6 +65,12 @@
        <item>chrome</item>
        <item>firefox</item>
        <item>safari</item>
+        <item>ios</item>
+        <item>android</item>
+        <item>edge</item>
+        <item>360</item>
+        <item>qq</item>
+        <item>random</item>
        <item>randomized</item>
    </string-array>

@@ -110,12 +116,6 @@

    <string-array name="flows" translatable="false">
        <item></item>
-        <item>xtls-rprx-origin</item>
-        <item>xtls-rprx-origin-udp443</item>
-        <item>xtls-rprx-direct</item>
-        <item>xtls-rprx-direct-udp443</item>
-        <item>xtls-rprx-splice</item>
-        <item>xtls-rprx-splice-udp443</item>
        <item>xtls-rprx-vision</item>
        <item>xtls-rprx-vision-udp443</item>
    </string-array>
--- a/V2rayNG/app/src/main/res/values/colors.xml
+++ b/V2rayNG/app/src/main/res/values/colors.xml
@@ -15,10 +15,4 @@
    <color name="colorAccent">#D81B60</color>
    <color name="colorBg">#FFFFFF</color>
    <color name="colorText">#000000</color>
-
-    <color name="colorPrimaryByDark">#2B2B2B</color>
-    <color name="colorPrimaryDarkByDark">#161616</color>
-    <color name="colorAccentByDark">#12976F</color>
-    <color name="colorBgByDark">#252525</color>
-    <color name="colorTextByDark">#CCCCCC</color>
 </resources>
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
    <string name="menu_item_import_config_manually_ss">Type manually[Shadowsocks]</string>
    <string name="menu_item_import_config_manually_socks">Type manually[Socks]</string>
    <string name="menu_item_import_config_manually_trojan">Type manually[Trojan]</string>
-    <string name="menu_item_import_config_custom">custom config</string>
+    <string name="menu_item_import_config_custom">Custom config</string>
    <string name="menu_item_import_config_custom_clipboard">Import custom config from Clipboard</string>
    <string name="menu_item_import_config_custom_local">Import custom config from locally</string>
    <string name="menu_item_import_config_custom_url">Import custom config from URL</string>
@@ -48,9 +48,9 @@
    <string name="server_lab_mode_type">gRPC mode</string>
    <string name="server_lab_request_host">request host(host/ws host/h2 host)/QUIC security</string>
    <string name="server_lab_path">path(ws path/h2 path)/QUIC key/kcp seed/gRPC serviceName</string>
-    <string name="server_lab_stream_security">tls</string>
-    <string name="server_lab_stream_fingerprint" translatable="false">uTLS</string>
-    <string name="server_lab_stream_alpn" translatable="false">alpn</string>
+    <string name="server_lab_stream_security">TLS</string>
+    <string name="server_lab_stream_fingerprint" translatable="false">Fingerprint</string>
+    <string name="server_lab_stream_alpn" translatable="false">Alpn</string>
    <string name="server_lab_allow_insecure">allowInsecure</string>
    <string name="server_lab_sni">SNI</string>
    <string name="server_lab_address3">address</string>
@@ -61,6 +61,9 @@
    <string name="server_lab_security4">User(Optional)</string>
    <string name="server_lab_encryption">encryption</string>
    <string name="server_lab_flow">flow</string>
+    <string name="server_lab_public_key" translatable="false">PublicKey</string>
+    <string name="server_lab_short_id" translatable="false">ShortId</string>
+    <string name="server_lab_spider_x" translatable="false">SpiderX</string>
    <string name="toast_success">Success</string>
    <string name="toast_failure">Failure</string>
    <string name="toast_none_data">There is nothing</string>
@@ -151,6 +154,9 @@
    <string name="title_pref_confirm_remove">Delete configuration file confirmation</string>
    <string name="summary_pref_confirm_remove">Whether to delete the configuration file requires a second confirmation by the user</string>

+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
    <string name="title_pref_feedback">Feedback</string>
    <string name="summary_pref_feedback">Feedback enhancements or bugs to GitHub</string>
    <string name="summary_pref_tg_group">Join Telegram Group</string>
@@ -163,12 +169,14 @@
    <string name="title_mode">Mode</string>
    <string name="title_mode_help">Click me for more help</string>
    <string name="title_language">Language</string>
+    <string name="title_ui_settings">UI settings</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">Copy</string>
    <string name="logcat_clear">Clear</string>
    <string name="title_service_restart">Service restart</string>
    <string name="title_del_all_config">Delete all config</string>
+    <string name="title_del_duplicate_config">Delete duplicate config</string>
    <string name="title_del_invalid_config">Delete invalid config(Test first)</string>
    <string name="title_export_all">Export non-custom configs to clipboard</string>
    <string name="title_sub_setting">Subscription group setting</string>
@@ -182,6 +190,7 @@
    <string name="title_sort_by_test_results">Sorting by test results</string>
    <string name="title_filter_config">Filter configuration file</string>
    <string name="filter_config_all">All subscription groups</string>
+    <string name="title_del_duplicate_config_count">Delete %d duplicate configurations</string>

    <string name="tasker_start_service">Start Service</string>
    <string name="tasker_setting_confirm">Confirm</string>
--- a/V2rayNG/app/src/main/res/values/styles.xml
+++ b/V2rayNG/app/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <resources>
-    <style name="AppThemeLight" parent="Theme.AppCompat.DayNight.DarkActionBar">
+
+    <style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight.DarkActionBar">
        <item name="colorPrimary">@color/colorPrimary</item>
        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
        <item name="colorAccent">@color/colorAccent</item>
@@ -7,20 +8,7 @@
        <item name="colorMainText">@color/colorText</item>
    </style>

-    <style name="AppThemeDark" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimaryByDark</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDarkByDark</item>
-        <item name="colorAccent">@color/colorAccentByDark</item>
-        <item name="colorMainBg">@color/colorBgByDark</item>
-        <item name="colorMainText">@color/colorTextByDark</item>
-    </style>
-
-    <style name="AppThemeLight_NoActionBar" parent="AppThemeLight">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppThemeDark_NoActionBar" parent="AppThemeDark">
+    <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
        <item name="windowActionBar">false</item>
        <item name="windowNoTitle">true</item>
    </style>
--- a/V2rayNG/app/src/main/res/xml/pref_settings.xml
+++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml
@@ -124,6 +124,20 @@
                android:summary="%s"
                android:title="@string/title_mode" />

+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/title_ui_settings">
+
+        <CheckBoxPreference
+            android:key="pref_confirm_remove"
+            android:summary="@string/summary_pref_confirm_remove"
+            android:title="@string/title_pref_confirm_remove" />
+
+        <CheckBoxPreference
+            android:key="pref_start_scan_immediate"
+            android:summary="@string/summary_pref_start_scan_immediate"
+            android:title="@string/title_pref_start_scan_immediate" />
+
        <ListPreference
            android:defaultValue="auto"
            android:entries="@array/language_select"
@@ -132,10 +146,5 @@
            android:summary="%s"
            android:title="@string/title_language" />

-        <CheckBoxPreference
-            android:key="pref_confirm_remove"
-            android:summary="@string/summary_pref_confirm_remove"
-            android:title="@string/title_pref_confirm_remove" />
-
    </PreferenceCategory>
 </PreferenceScreen>
--- a/V2rayNG/build.gradle
+++ b/V2rayNG/build.gradle
@@ -1,31 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://maven.google.com' }
-        maven { url 'https://jitpack.io' }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url 'https://maven.google.com' }
-        maven { url 'https://jitpack.io' }
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+plugins {
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
+}
--- a/V2rayNG/gradle.properties
+++ b/V2rayNG/gradle.properties
@@ -1,22 +1,10 @@
-## Project-wide Gradle settings.
-#
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-#
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
- org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-#Fri Jun 02 14:08:42 CST 2017
-kotlinVersion=1.6.21
-buildToolsVer=31.0.0
-compileSdkVer=31
-targetSdkVer=31
+
+buildToolsVer=33.0.2
+compileSdkVer=33
+targetSdkVer=33
 kotlin.incremental=true
 android.useAndroidX=true
 android.enableJetifier=true
+kotlin.code.style=official
+android.nonTransitiveRClass=true
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
--- a/V2rayNG/gradle/wrapper/gradle-wrapper.properties
+++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
--- a/V2rayNG/settings.gradle
+++ b/V2rayNG/settings.gradle
@@ -1 +1,17 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        jcenter()
+    }
+}
+rootProject.name = "V2rayNG"
 include ':app'
Author	SHA1	Message	Date
2dust	2f3c2cf4d5	up 1.8.4	2023-04-29 20:46:28 +08:00
2dust	892358d5d8	Merge pull request #2227 from AlirezaIvaz/master Add themed icon support	2023-04-27 09:40:08 +08:00
Alireza Ivaz	6dced903cd	Add themed icon support	2023-04-26 17:05:11 +03:30
2dust	f8a98a426e	Merge pull request #2213 from solokot/master Updated Russian translation	2023-04-22 14:40:57 +08:00
solokot	011506e99f	Updated Russian translation	2023-04-21 21:33:22 +03:00
2dust	966151d3fe	bug fixes	2023-04-19 19:45:11 +08:00
2dust	247f4db77e	up 1.8.3	2023-04-18 09:51:49 +08:00
2dust	9a661bc401	Use Google code scanner	2023-04-17 10:28:34 +08:00
2dust	f5f1b3816c	Refactor createQRCode	2023-04-16 19:58:51 +08:00
2dust	3971c9badc	use Exception	2023-04-16 19:56:44 +08:00
2dust	390fbf046b	Merge pull request #2130 from pouriaksrvi/master [New Feature] UX enhancement - Reversed the order of server list	2023-04-06 08:28:54 +08:00
Programmer	ec7ba59528	Bug Fix - Fixed the order of subscription import Subscription server list should not be reversed when it is being imported. Fixed this problem.	2023-04-03 04:12:01 +03:30
Programmer	838941c6a4	Merge branch '2dust:master' into master	2023-04-03 04:00:52 +03:30
2dust	a0ec764b64	Merge pull request #2142 from solokot/master Updated Russian translation	2023-04-02 09:32:29 +08:00
2dust	26f1f7099b	up 1.8.2	2023-04-01 18:08:11 +08:00
2dust	613e9ac8bf	Add permission POST_NOTIFICATIONS and READ_MEDIA_IMAGES	2023-03-31 13:48:40 +08:00
2dust	ea979f02b5	update gradle	2023-03-30 20:45:37 +08:00
2dust	383f55f809	update org.jetbrains.kotlin.android to 1.8.0	2023-03-30 13:21:36 +08:00
2dust	ce61f177dc	Adjust build gradle	2023-03-30 11:54:15 +08:00
2dust	6a64157537	update kotlinx-coroutines to 1.6.4	2023-03-29 16:15:43 +08:00
2dust	de83302c8a	update buildtoolsversion & targetSdkversion to 33	2023-03-29 15:54:35 +08:00
2dust	68553d3807	update kotlin version to 1.7.20	2023-03-29 15:25:54 +08:00
solokot	4cfe3394b1	Updated Russian translation	2023-03-29 09:35:28 +03:00
Programmer	ae9aa75ba0	New Feature Fixed incorrect default order of server list as described in the issue https://github.com/2dust/v2rayNG/issues/2116 The order was problematic for users who add new servers more frequently	2023-03-26 06:27:52 +00:00
2dust	3d7ed12d4b	Added the function of deleting duplicate configurations	2023-03-25 21:16:21 +08:00
2dust	f70be5bce9	routing domainMatcher is set to null	2023-03-25 18:10:29 +08:00
2dust	405667697e	REALITY show false	2023-03-25 18:09:53 +08:00
2dust	3aeda7de81	Merge pull request #2122 from justlovediaodiao/master fix a crash when adding custom config	2023-03-24 09:15:01 +08:00
yangxing	8a775d662a	fix a crash when adding empty custom config	2023-03-23 22:25:07 +08:00
2dust	ec0ccbca76	up 1.8.1	2023-03-21 17:17:51 +08:00
2dust	6cdcbb0096	Add REALITY share link	2023-03-21 10:04:03 +08:00
2dust	79e3881704	hide alpn in reality	2023-03-21 09:19:21 +08:00
2dust	4cf2d429f0	Adjust string	2023-03-21 09:18:46 +08:00
2dust	fa51952bfa	up 1.8.0	2023-03-10 11:17:25 +08:00
2dust	b2c4c0a67e	Adjust string	2023-03-10 10:00:34 +08:00
2dust	cf2c58637b	Merge pull request #2036 from yuhan6665/reality Add reality and remove legacy xtls settings	2023-02-21 20:26:58 +08:00
yuhan6665	a2c262441e	Add reality and remove legacy xtls settings No sharing support for Reality yet	2023-02-20 21:25:33 -05:00
2dust	237be79680	up 1.7.38	2023-02-08 20:07:30 +08:00
2dust	441a64b8c6	add more fingerprint	2023-02-08 20:07:12 +08:00
2dust	2128488658	up 1.7.37 (rollback core to 1.7.2)	2023-02-03 12:04:39 +08:00
2dust	d9dc8317f5	up 1.7.36	2023-02-03 10:47:28 +08:00
2dust	6eda2180e4	Update strings.xml	2023-02-03 10:42:24 +08:00
2dust	57a2f0bebf	share link to add fingerprint	2023-02-03 10:11:40 +08:00
2dust	1fd3ccaa0c	Merge pull request #1959 from user09283/patch-2 Update strings.xml	2023-01-29 20:23:23 +08:00
user09283	528597d0c7	Update strings.xml	2023-01-29 16:22:31 +07:00
user09283	37411e3e6b	Update strings.xml	2023-01-29 16:13:38 +07:00
2dust	6d681b92aa	up 1.7.35	2023-01-28 15:52:25 +08:00
2dust	73fae63905	Merge pull request #1942 from user09283/patch-1 Update strings.xml (vi)	2023-01-28 15:38:04 +08:00
2dust	216710974a	Merge pull request #1920 from ysy950803/master Replace colors hard code with values-night.	2023-01-28 15:37:53 +08:00
user09283	f3bbef7412	Update strings.xml	2023-01-26 14:03:47 +07:00
user09283	fa74d9c598	Update strings.xml	2023-01-24 21:00:51 +07:00
user09283	113364af26	Update strings.xml	2023-01-24 20:51:43 +07:00
Sylvester Yao	2990db305e	Replace colors hard code with values-night.	2023-01-13 12:00:59 +08:00
2dust	db8942fe5a	up 1.7.34	2023-01-12 15:42:47 +08:00