up 1.8.2

fix a crash when adding custom config

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 504
-        versionName "1.8.0"
-    }
-
-    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 510
+        versionName "1.8.2"
     }
 
     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,29 +84,29 @@ 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'
@@ -139,13 +116,4 @@ dependencies {
     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' }
-//    }
-//}
+}

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"

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

@@ -191,7 +191,7 @@ data class V2rayConfig(
                                        val disableSystemRoot: Boolean? = null,
                                        val enableSessionResumption: Boolean? = null,
                     // REALITY settings
-                                       val show: Boolean = true,
+                                       val show: Boolean = false,
                                        var publicKey: String? = null,
                                        var shortId: String? = null,
                                        var spiderX: String? = null)
@@ -447,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

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()
         }
     }
 

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

@@ -7,6 +7,7 @@ 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
@@ -70,18 +71,23 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         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)

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

@@ -116,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) {
@@ -158,6 +159,7 @@ class ServerActivity : BaseActivity() {
                         container_spider_x?.visibility = View.GONE
                     } else {
                         container_allow_insecure?.visibility = View.GONE
+                        container_alpn?.visibility = View.GONE
                         container_public_key?.visibility = View.VISIBLE
                         container_short_id?.visibility = View.VISIBLE
                         container_spider_x?.visibility = View.VISIBLE
@@ -381,8 +383,8 @@ 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
@@ -420,14 +422,19 @@ class ServerActivity : BaseActivity() {
     }
 
     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("---")
+            }
         }
     }
 
@@ -436,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) { _, _ ->

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

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

V2rayNG/app/src/main/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

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

@@ -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)) {

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"

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

@@ -165,6 +165,7 @@
     <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>
@@ -178,6 +179,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>

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

@@ -165,6 +165,7 @@
     <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>
@@ -178,6 +179,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>

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

@@ -164,6 +164,7 @@
     <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>
@@ -177,6 +178,7 @@
     <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 v2rayNG</string>
     <string name="tasker_setting_confirm">Xác nhận</string>

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

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

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

@@ -164,6 +164,7 @@
     <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 +178,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>

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

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

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
+}

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

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

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'