up 1.9.8

Some IPs or domains are already included in geoip / geosite

.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
         go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true
         gomobile init
         go mod tidy -v
-        gomobile bind -v -androidapi 19 -ldflags='-s -w' ./
+        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
         cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/
 
     - name: Build APK

README.md

@@ -3,7 +3,7 @@
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)
 
 [![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.6.21-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.9.23-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)

V2rayNG/app/build.gradle.kts

@@ -11,18 +11,22 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 21
         targetSdk = 34
-        versionCode = 575
+        versionCode = 602
-        versionName = "1.8.31"
+        versionName = "1.9.8"
         multiDexEnabled = true
-        splits.abi {
+        splits {
-            reset()
+            abi {
-            include(
+                isEnable = true
-                "arm64-v8a",
+                include(
-                "armeabi-v7a",
+                    "arm64-v8a",
-                "x86_64",
+                    "armeabi-v7a",
-                "x86"
+                    "x86_64",
-            )
+                    "x86"
+                )
+                isUniversalApk = true
+            }
         }
+
     }
 
     compileOptions {
@@ -50,13 +54,6 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
-    splits {
-        abi {
-            isEnable = true
-            isUniversalApk = true
-        }
-    }
-
     applicationVariants.all {
         val variant = this
         val versionCodes =
@@ -71,12 +68,9 @@ android {
                     "universal"
 
                 output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk"
-                if(versionCodes.containsKey(abi))
+                if (versionCodes.containsKey(abi)) {
-                {
                     output.versionCodeOverride = (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
-                }
+                } else {
-                else
-                {
                     return@forEach
                 }
             }
@@ -87,7 +81,7 @@ android {
         buildConfig = true
     }
 
-    packagingOptions {
+    packaging {
         jniLibs {
             useLegacyPackaging = true
         }
@@ -95,45 +89,44 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar","*.jar"))))
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar", "*.jar"))))
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(libs.junit)
 
-    implementation("com.google.android.flexbox:flexbox:3.0.0")
+    implementation(libs.flexbox)
     // Androidx
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation(libs.constraintlayout)
-    implementation("androidx.legacy:legacy-support-v4:1.0.0")
+    implementation(libs.legacy.support.v4)
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation(libs.appcompat)
-    implementation("com.google.android.material:material:1.12.0")
+    implementation(libs.material)
-    implementation("androidx.cardview:cardview:1.0.0")
+    implementation(libs.cardview)
-    implementation("androidx.preference:preference-ktx:1.2.1")
+    implementation(libs.preference.ktx)
-    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    implementation(libs.recyclerview)
-    implementation("androidx.fragment:fragment-ktx:1.8.1")
+    implementation(libs.fragment.ktx)
-    implementation("androidx.multidex:multidex:2.0.1")
+    implementation(libs.multidex)
-    implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation(libs.viewpager2)
 
     // Androidx ktx
-    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation(libs.activity.ktx)
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
+    implementation(libs.lifecycle.viewmodel.ktx)
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3")
+    implementation(libs.lifecycle.livedata.ktx)
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3")
+    implementation(libs.lifecycle.runtime.ktx)
 
     //kotlin
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
+    implementation(libs.kotlin.reflect)
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
+    implementation(libs.kotlinx.coroutines.core)
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
+    implementation(libs.kotlinx.coroutines.android)
 
-    implementation("com.tencent:mmkv-static:1.3.4")
+    implementation(libs.mmkv.static)
-    implementation("com.google.code.gson:gson:2.11.0")
+    implementation(libs.gson)
-    implementation("io.reactivex:rxjava:1.3.8")
+    implementation(libs.rxjava)
-    implementation("io.reactivex:rxandroid:1.2.1")
+    implementation(libs.rxandroid)
-    implementation("com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar")
+    implementation(libs.rxpermissions)
-    implementation("me.drakeet.support:toastcompat:1.1.0")
+    implementation(libs.toastcompat)
-    implementation("com.blacksquircle.ui:editorkit:2.9.0")
+    implementation(libs.editorkit)
-    implementation("com.blacksquircle.ui:language-base:2.9.0")
+    implementation(libs.language.base)
-    implementation("com.blacksquircle.ui:language-json:2.9.0")
+    implementation(libs.language.json)
-    implementation("io.github.g00fy2.quickie:quickie-bundled:1.9.0")
+    implementation(libs.quickie.bundled)
-    implementation("com.google.zxing:core:3.5.3")
+    implementation(libs.core)
-
+    implementation(libs.work.runtime.ktx)
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    implementation(libs.work.multiprocess)
-    implementation("androidx.work:work-multiprocess:2.8.1")
 }

V2rayNG/app/src/main/AndroidManifest.xml

@@ -5,21 +5,32 @@
 
     <supports-screens
         android:anyDensity="true"
-        android:smallScreens="true"
-        android:normalScreens="true"
         android:largeScreens="true"
-        android:xlargeScreens="true"/>
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
 
-    <uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.blacksquircle.ui.editorkit"/>
+    <uses-sdk
+        android:minSdkVersion="21"
+        tools:overrideLibrary="com.blacksquircle.ui.editorkit" />
 
-    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+        android:name="android.hardware.camera"
-    <uses-feature android:name="android.software.leanback" android:required="false" />
+        android:required="false" />
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
 
     <!-- https://developer.android.com/about/versions/11/privacy/package-visibility -->
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+    <uses-permission
-            tools:ignore="QueryAllPackagesPermission" />
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -31,15 +42,15 @@
         android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"
         android:minSdkVersion="34" />
     <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:name=".AngApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
         android:banner="@mipmap/ic_banner"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppThemeDayNight"
@@ -53,91 +64,97 @@
             android:theme="@style/AppThemeDayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:exported="false"
             android:name=".ui.ServerActivity"
+            android:exported="false"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
-            android:exported="false"
             android:name=".ui.ServerCustomConfigActivity"
+            android:exported="false"
             android:windowSoftInputMode="stateUnchanged" />
         <activity
-            android:exported="false"
+            android:name=".ui.SettingsActivity"
-            android:name=".ui.SettingsActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.PerAppProxyActivity"
-            android:name=".ui.PerAppProxyActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.ScannerActivity"
-            android:name=".ui.ScannerActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.LogcatActivity"
-            android:name=".ui.LogcatActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.RoutingSettingActivity"
-            android:name=".ui.RoutingSettingsActivity"
+            android:exported="false" />
-            android:windowSoftInputMode="stateUnchanged" />
         <activity
-            android:exported="false"
+            android:name=".ui.RoutingEditActivity"
-            android:name=".ui.SubSettingActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.SubSettingActivity"
-            android:name=".ui.UserAssetActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.UserAssetActivity"
-            android:name=".ui.UserAssetUrlActivity" />
+            android:exported="false" />
+        <activity
+            android:name=".ui.UserAssetUrlActivity"
+            android:exported="false" />
 
         <activity
-            android:exported="false"
+            android:name=".ui.SubEditActivity"
-            android:name=".ui.SubEditActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
+            android:name=".ui.ScScannerActivity"
-            android:name=".ui.ScScannerActivity" />
+            android:exported="false" />
         <activity
-            android:exported="false"
             android:name=".ui.ScSwitchActivity"
             android:excludeFromRecents="true"
+            android:exported="false"
             android:process=":RunSoLibV2RayDaemon"
             android:theme="@style/AppTheme.NoActionBar.Translucent" />
 
         <activity
-            android:exported="true"
+            android:name=".ui.UrlSchemeActivity"
-            android:name=".ui.UrlSchemeActivity">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE"/>
+
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="v2rayng"/>
+                <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="install-config"/>
+
-                <data android:host="install-sub"/>
+                <data android:scheme="v2rayng" />
+                <data android:host="install-config" />
+                <data android:host="install-sub" />
             </intent-filter>
         </activity>
         <activity
-            android:exported="false"
+            android:name=".ui.AboutActivity"
-            android:name=".ui.AboutActivity" />
+            android:exported="false" />
 
         <service
             android:name=".service.V2RayVpnService"
             android:enabled="true"
             android:exported="false"
+            android:foregroundServiceType="specialUse"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="specialUse"
             android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -150,43 +167,52 @@
                 android:value="vpn" />
         </service>
 
-        <service android:name=".service.V2RayProxyOnlyService"
+        <service
-                android:exported="false"
+            android:name=".service.V2RayProxyOnlyService"
-                android:label="@string/app_name"
+            android:exported="false"
-                android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="specialUse"
-                android:process=":RunSoLibV2RayDaemon">
+            android:label="@string/app_name"
+            android:process=":RunSoLibV2RayDaemon">
             <property
                 android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
                 android:value="proxy" />
         </service>
 
-        <service android:name=".service.V2RayTestService"
+        <service
+            android:name=".service.V2RayTestService"
             android:exported="false"
-            android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon" />
-        </service>
 
         <receiver
-                android:exported="true"
+            android:name=".receiver.WidgetProvider"
-                android:name=".receiver.WidgetProvider"
+            android:exported="true"
-                android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon">
             <meta-data
-                    android:name="android.appwidget.provider"
+                android:name="android.appwidget.provider"
-                    android:resource="@xml/app_widget_provider" />
+                android:resource="@xml/app_widget_provider" />
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="com.v2ray.ang.action.widget.click" />
                 <action android:name="com.v2ray.ang.action.activity" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:exported="true"
+            android:label="BootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
 
         <service
-                android:exported="true"
+            android:name=".service.QSTileService"
-                android:name=".service.QSTileService"
+            android:exported="true"
-                android:icon="@drawable/ic_stat_name"
+            android:foregroundServiceType="specialUse"
-                android:label="@string/app_tile_name"
+            android:icon="@drawable/ic_stat_name"
-                android:foregroundServiceType="specialUse"
+            android:label="@string/app_tile_name"
-                android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-                android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -196,8 +222,8 @@
         </service>
         <!-- =====================Tasker===================== -->
         <activity
-            android:exported="true"
             android:name=".ui.TaskerActivity"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name">
             <intent-filter>
@@ -206,9 +232,9 @@
         </activity>
 
         <receiver
-            android:exported="true"
             android:name=".receiver.TaskerReceiver"
-                android:process=":RunSoLibV2RayDaemon">
+            android:exported="true"
+            android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>
@@ -234,7 +260,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/cache_paths"/>
+                android:resource="@xml/cache_paths" />
         </provider>
 
     </application>

V2rayNG/app/src/main/assets/custom_routing_black

@@ -0,0 +1,73 @@
+[
+  {
+    "remarks": "绕过bittorrent",
+    "outboundTag": "direct",
+    "protocol": [
+      "bittorrent"
+    ]
+  },
+  {
+    "remarks": "Google cn",
+    "outboundTag": "proxy",
+    "domain": [
+      "domain:googleapis.cn",
+      "domain:gstatic.com"
+    ]
+  },
+  {
+    "remarks": "阻断udp443",
+    "outboundTag": "block",
+    "port": "443",
+    "network": "udp"
+  },
+  {
+    "remarks": "阻断广告",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "remarks": "绕过局域网IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:private"
+    ]
+  },
+  {
+    "remarks": "绕过局域网域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
+  {
+    "remarks": "代理GFW",
+    "outboundTag": "proxy",
+    "domain": [
+      "geosite:gfw",
+      "geosite:greatfire"
+    ]
+  },
+  {
+    "remarks": "代理Google等",
+    "outboundTag": "proxy",
+    "ip": [
+      "1.0.0.1",
+      "1.1.1.1",
+      "8.8.8.8",
+      "8.8.4.4",
+      "geoip:facebook",
+      "geoip:fastly",
+      "geoip:google",
+      "geoip:netflix",
+      "geoip:telegram",
+      "geoip:twitter"
+    ]
+  },
+  {
+    "remarks": "最终直连",
+    "port": "0-65535",
+    "outboundTag": "direct"
+  }
+]

V2rayNG/app/src/main/assets/custom_routing_block

@@ -1 +0,0 @@
-geosite:category-ads-all,

V2rayNG/app/src/main/assets/custom_routing_direct

@@ -1,2 +0,0 @@
-geosite:cn,
-geosite:geolocation-cn

V2rayNG/app/src/main/assets/custom_routing_global

@@ -0,0 +1,34 @@
+[
+  {
+    "remarks": "阻断udp443",
+    "outboundTag": "block",
+    "port": "443",
+    "network": "udp"
+  },
+  {
+    "remarks": "阻断广告",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "remarks": "绕过局域网IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:private"
+    ]
+  },
+  {
+    "remarks": "绕过局域网域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
+  {
+    "remarks": "最终代理",
+    "port": "0-65535",
+    "outboundTag": "proxy"
+  }
+]

V2rayNG/app/src/main/assets/custom_routing_proxy

@@ -1 +0,0 @@
-geosite:geolocation-!cn

V2rayNG/app/src/main/assets/custom_routing_white

@@ -0,0 +1,57 @@
+[
+  {
+    "remarks": "阻断udp443",
+    "outboundTag": "block",
+    "port": "443",
+    "network": "udp"
+  },
+  {
+    "remarks": "阻断广告",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "remarks": "绕过局域网IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:private"
+    ]
+  },
+  {
+    "remarks": "绕过局域网域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
+  {
+    "remarks": "绕过中国IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:cn"
+    ]
+  },
+  {
+    "remarks": "绕过中国域名",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:cn",
+      "geosite:geolocation-cn"
+    ]
+  },
+  {
+    "remarks": "Google CN",
+    "outboundTag": "proxy",
+    "domain": [
+      "domain:googleapis.cn",
+      "domain:gstatic.com"
+    ]
+  },
+  {
+    "remarks": "最终代理",
+    "port": "0-65535",
+    "outboundTag": "proxy"
+  }
+]

V2rayNG/app/src/main/assets/custom_routing_white_iran

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

V2rayNG/app/src/main/assets/v2ray_config.json

@@ -81,7 +81,9 @@
   },
   {
     "protocol": "freedom",
-    "settings": {},
+    "settings": {
+      "domainStrategy": "UseIP"
+    },
     "tag": "direct"
   },
   {

V2rayNG/app/src/main/java/com/v2ray/ang/helper/ItemTouchHelperAdapter.java

@@ -16,8 +16,8 @@
 
 package com.v2ray.ang.helper;
 
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.
@@ -36,7 +36,6 @@ public interface ItemTouchHelperAdapter {
      * @param fromPosition The start position of the moved item.
      * @param toPosition   Then resolved position of the moved item.
      * @return True if the item was moved to the new adapter position.
-     *
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */
@@ -52,7 +51,6 @@ public interface ItemTouchHelperAdapter {
      * adjusting the underlying data to reflect this removal.
      *
      * @param position The position of the item dismissed.
-     *
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */

V2rayNG/app/src/main/java/com/v2ray/ang/helper/OnStartDragListener.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2015 Paul Burke
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.v2ray.ang.helper;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Listener for manual initiation of a drag.
- */
-public interface OnStartDragListener {
-
-    /**
-     * Called when a view is requesting a start of a drag.
-     *
-     * @param viewHolder The holder of the view to drag.
-     */
-    void onStartDrag(RecyclerView.ViewHolder viewHolder);
-
-}

V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.java

@@ -17,9 +17,10 @@
 package com.v2ray.ang.helper;
 
 import android.graphics.Canvas;
+
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,12 +1,16 @@
 package com.v2ray.ang
 
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
+import androidx.work.WorkManager
 import com.tencent.mmkv.MMKV
+import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 
-class AngApplication : MultiDexApplication(), Configuration.Provider {
+class AngApplication : MultiDexApplication() {
     companion object {
         //const val PREF_LAST_VERSION = "pref_last_version"
         lateinit var application: AngApplication
@@ -17,8 +21,9 @@ class AngApplication : MultiDexApplication(), Configuration.Provider {
         application = this
     }
 
-    //var firstRun = false
+    private val workManagerConfiguration: Configuration = Configuration.Builder()
-     //   private set
+        .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
+        .build()
 
     override fun onCreate() {
         super.onCreate()
@@ -30,15 +35,18 @@ class AngApplication : MultiDexApplication(), Configuration.Provider {
 //        if (firstRun)
 //            defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
 
-        //Logger.init().logLevel(if (BuildConfig.DEBUG) LogLevel.FULL else LogLevel.NONE)
         MMKV.initialize(this)
 
         Utils.setNightMode(application)
+        // Initialize WorkManager with the custom configuration
+        WorkManager.initialize(this, workManagerConfiguration)
+
+        SettingsManager.initRoutingRulesets(this)
     }
 
-    override fun getWorkManagerConfiguration(): Configuration {
+    fun getPackageInfo(packageName: String) = packageManager.getPackageInfo(
-        return Configuration.Builder()
+        packageName, if (Build.VERSION.SDK_INT >= 28) PackageManager.GET_SIGNING_CERTIFICATES
-            .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
+        else @Suppress("DEPRECATION") PackageManager.GET_SIGNATURES
-            .build()
+    )!!
-    }
+
 }

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

@@ -1,22 +1,22 @@
 package com.v2ray.ang
 
-/**
+
- *
- * App Config Const
- */
 object AppConfig {
+
+    /** The application's package name. */
     const val ANG_PACKAGE = BuildConfig.APPLICATION_ID
+
+    /** Directory names used in the app's file system. */
     const val DIR_ASSETS = "assets"
     const val DIR_BACKUPS = "backups"
 
-    // legacy
+    /** Legacy configuration keys. */
     const val ANG_CONFIG = "ang_config"
     const val PREF_INAPP_BUY_IS_PREMIUM = "pref_inapp_buy_is_premium"
 
-    // Preferences mapped to MMKV
+    /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
     const val PREF_ROUTE_ONLY_ENABLED = "pref_route_only_enabled"
-
     const val PREF_PER_APP_PROXY = "pref_per_app_proxy"
     const val PREF_PER_APP_PROXY_SET = "pref_per_app_proxy_set"
     const val PREF_BYPASS_APPS = "pref_bypass_apps"
@@ -24,35 +24,25 @@ object AppConfig {
     const val PREF_FAKE_DNS_ENABLED = "pref_fake_dns_enabled"
     const val PREF_LOCAL_DNS_PORT = "pref_local_dns_port"
     const val PREF_VPN_DNS = "pref_vpn_dns"
-
     const val PREF_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
-    const val PREF_ROUTING_MODE = "pref_routing_mode"
+    const val PREF_ROUTING_RULESET = "pref_routing_ruleset"
-    const val PREF_V2RAY_ROUTING_AGENT = "pref_v2ray_routing_agent"
-    const val PREF_V2RAY_ROUTING_DIRECT = "pref_v2ray_routing_direct"
-    const val PREF_V2RAY_ROUTING_BLOCKED = "pref_v2ray_routing_blocked"
-    const val PREF_ROUTING_CUSTOM = "pref_routing_custom"
-
     const val PREF_MUX_ENABLED = "pref_mux_enabled"
-    const val PREF_MUX_CONCURRENCY = "pref_mux_concurency"
+    const val PREF_MUX_CONCURRENCY = "pref_mux_concurrency"
-    const val PREF_MUX_XUDP_CONCURRENCY = "pref_mux_xudp_concurency"
+    const val PREF_MUX_XUDP_CONCURRENCY = "pref_mux_xudp_concurrency"
     const val PREF_MUX_XUDP_QUIC = "pref_mux_xudp_quic"
-
     const val PREF_FRAGMENT_ENABLED = "pref_fragment_enabled"
     const val PREF_FRAGMENT_PACKETS = "pref_fragment_packets"
     const val PREF_FRAGMENT_LENGTH = "pref_fragment_length"
     const val PREF_FRAGMENT_INTERVAL = "pref_fragment_interval"
-
     const val SUBSCRIPTION_AUTO_UPDATE = "pref_auto_update_subscription"
     const val SUBSCRIPTION_AUTO_UPDATE_INTERVAL = "pref_auto_update_interval"
-    const val SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL = "1440" // 24 hours
+    const val SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL = "1440" // Default is 24 hours
     const val SUBSCRIPTION_UPDATE_TASK_NAME = "subscription_updater"
-
     const val PREF_SPEED_ENABLED = "pref_speed_enabled"
     const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
     const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"
     const val PREF_LANGUAGE = "pref_language"
     const val PREF_UI_MODE_NIGHT = "pref_ui_mode_night"
-
     const val PREF_PREFER_IPV6 = "pref_prefer_ipv6"
     const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled"
     const val PREF_ALLOW_INSECURE = "pref_allow_insecure"
@@ -63,31 +53,40 @@ object AppConfig {
     const val PREF_DELAY_TEST_URL = "pref_delay_test_url"
     const val PREF_LOGLEVEL = "pref_core_loglevel"
     const val PREF_MODE = "pref_mode"
+    const val PREF_IS_BOOTED = "pref_is_booted"
 
+    /** Cache keys. */
     const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
     const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"
 
-    //Preferences mapped to MMKV End
+    /** Protocol identifiers. */
-
     const val PROTOCOL_HTTP: String = "http://"
     const val PROTOCOL_HTTPS: String = "https://"
     const val PROTOCOL_FREEDOM: String = "freedom"
 
+    /** Broadcast actions. */
     const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
     const val BROADCAST_ACTION_ACTIVITY = "com.v2ray.ang.action.activity"
     const val BROADCAST_ACTION_WIDGET_CLICK = "com.v2ray.ang.action.widget.click"
 
+    /** Tasker extras. */
     const val TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"
     const val TASKER_EXTRA_STRING_BLURB = "com.twofortyfouram.locale.intent.extra.BLURB"
     const val TASKER_EXTRA_BUNDLE_SWITCH = "tasker_extra_bundle_switch"
     const val TASKER_EXTRA_BUNDLE_GUID = "tasker_extra_bundle_guid"
     const val TASKER_DEFAULT_GUID = "Default"
 
+    /** Tags for different proxy modes. */
     const val TAG_PROXY = "proxy"
     const val TAG_DIRECT = "direct"
     const val TAG_BLOCKED = "block"
     const val TAG_FRAGMENT = "fragment"
 
+    /** Network-related constants. */
+    const val UPLINK = "uplink"
+    const val DOWNLINK = "downlink"
+
+    /** URLs for various resources. */
     const val androidpackagenamelistUrl =
         "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
     const val v2rayCustomRoutingListUrl =
@@ -102,17 +101,25 @@ object AppConfig {
     const val DelayTestUrl = "https://www.gstatic.com/generate_204"
     const val DelayTestUrl2 = "https://www.google.com/generate_204"
 
+    /** DNS server addresses. */
     const val DNS_PROXY = "1.1.1.1"
     const val DNS_DIRECT = "223.5.5.5"
     const val DNS_VPN = "1.1.1.1"
+    const val GEOSITE_PRIVATE = "geosite:private"
+    const val GEOSITE_CN = "geosite:cn"
+    const val GEOIP_PRIVATE = "geoip:private"
+    const val GEOIP_CN = "geoip:cn"
 
+    /** Ports and addresses for various services. */
     const val PORT_LOCAL_DNS = "10853"
     const val PORT_SOCKS = "10808"
     const val PORT_HTTP = "10809"
     const val WIREGUARD_LOCAL_ADDRESS_V4 = "172.16.0.2/32"
     const val WIREGUARD_LOCAL_ADDRESS_V6 = "2606:4700:110:8f81:d551:a0:532e:a2b3/128"
     const val WIREGUARD_LOCAL_MTU = "1420"
+    const val LOOPBACK = "127.0.0.1"
 
+    /** Message constants for communication. */
     const val MSG_REGISTER_CLIENT = 1
     const val MSG_STATE_RUNNING = 11
     const val MSG_STATE_NOT_RUNNING = 12
@@ -128,4 +135,27 @@ object AppConfig {
     const val MSG_MEASURE_CONFIG = 7
     const val MSG_MEASURE_CONFIG_SUCCESS = 71
     const val MSG_MEASURE_CONFIG_CANCEL = 72
+
+    /** Notification channel IDs and names. */
+    const val RAY_NG_CHANNEL_ID = "RAY_NG_M_CH_ID"
+    const val RAY_NG_CHANNEL_NAME = "v2rayNG Background Service"
+    const val SUBSCRIPTION_UPDATE_CHANNEL = "subscription_update_channel"
+    const val SUBSCRIPTION_UPDATE_CHANNEL_NAME = "Subscription Update Service"
+
+    /** Protocols Scheme **/
+    const val VMESS = "vmess://"
+    const val CUSTOM = ""
+    const val SHADOWSOCKS = "ss://"
+    const val SOCKS = "socks://"
+    const val HTTP = "http://"
+    const val VLESS = "vless://"
+    const val TROJAN = "trojan://"
+    const val WIREGUARD = "wireguard://"
+    const val TUIC = "tuic://"
+    const val HYSTERIA2 = "hysteria2://"
+    const val HY2 = "hy2://"
+
+    /** Give a good name to this, IDK*/
+    const val VPN = "VPN"
+
 }

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

@@ -2,8 +2,10 @@ package com.v2ray.ang.dto
 
 import android.graphics.drawable.Drawable
 
-data class AppInfo(val appName: String,
+data class AppInfo(
-                   val packageName: String,
+    val appName: String,
-                   val appIcon: Drawable,
+    val packageName: String,
-                   val isSystemApp: Boolean,
+    val appIcon: Drawable,
-                   var isSelected: Int)
+    val isSystemApp: Boolean,
+    var isSelected: Int
+)

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

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

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

@@ -1,13 +1,19 @@
 package com.v2ray.ang.dto
 
+import com.v2ray.ang.AppConfig
+
+
 enum class EConfigType(val value: Int, val protocolScheme: String) {
-    VMESS(1, "vmess://"),
+    VMESS(1, AppConfig.VMESS),
-    CUSTOM(2, ""),
+    CUSTOM(2, AppConfig.CUSTOM),
-    SHADOWSOCKS(3, "ss://"),
+    SHADOWSOCKS(3, AppConfig.SHADOWSOCKS),
-    SOCKS(4, "socks://"),
+    SOCKS(4, AppConfig.SOCKS),
-    VLESS(5, "vless://"),
+    VLESS(5, AppConfig.VLESS),
-    TROJAN(6, "trojan://"),
+    TROJAN(6, AppConfig.TROJAN),
-    WIREGUARD(7, "wireguard://");
+    WIREGUARD(7, AppConfig.WIREGUARD),
+//    TUIC(8, AppConfig.TUIC),
+    HYSTERIA2(9, AppConfig.HYSTERIA2),
+    HTTP(10, AppConfig.HTTP);
 
     companion object {
         fun fromInt(value: Int) = values().firstOrNull { it.value == value }

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

@@ -1,9 +0,0 @@
-package com.v2ray.ang.dto
-
-enum class ERoutingMode(val value: String  ) {
-    GLOBAL_PROXY("0"),
-    BYPASS_LAN("1"),
-    BYPASS_MAINLAND("2"),
-    BYPASS_LAN_MAINLAND("3"),
-    GLOBAL_DIRECT("4");
-}

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

@@ -0,0 +1,29 @@
+package com.v2ray.ang.dto
+
+data class Hysteria2Bean(
+    val server: String?,
+    val auth: String?,
+    val lazy: Boolean? = true,
+    val obfs: ObfsBean? = null,
+    val socks5: Socks5Bean? = null,
+    val http: Socks5Bean? = null,
+    val tls: TlsBean? = null,
+) {
+    data class ObfsBean(
+        val type: String?,
+        val salamander: SalamanderBean?
+    ) {
+        data class SalamanderBean(
+            val password: String?,
+        )
+    }
+
+    data class Socks5Bean(
+        val listen: String?,
+    )
+
+    data class TlsBean(
+        val sni: String?,
+        val insecure: Boolean?,
+    )
+}

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

@@ -0,0 +1,9 @@
+package com.v2ray.ang.dto
+
+data class ProfileItem(
+    val configType: EConfigType,
+    var subscriptionId: String = "",
+    var remarks: String = "",
+    var server: String?,
+    var serverPort: Int?,
+)

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

@@ -0,0 +1,13 @@
+package com.v2ray.ang.dto
+
+data class RulesetItem(
+    var remarks: String? = "",
+    var ip: List<String>? = null,
+    var domain: List<String>? = null,
+    var outboundTag: String = "",
+    var port: String? = null,
+    var network: String? = null,
+    var protocol: List<String>? = null,
+    var enabled: Boolean = true,
+    var looked: Boolean? = false,
+)

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

@@ -1,50 +1,68 @@
 package com.v2ray.ang.dto
 
-import com.v2ray.ang.AppConfig.TAG_PROXY
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.util.Utils
+import com.v2ray.ang.AppConfig.TAG_PROXY
 
 data class ServerConfig(
-        val configVersion: Int = 3,
+    val configVersion: Int = 3,
-        val configType: EConfigType,
+    val configType: EConfigType,
-        var subscriptionId: String = "",
+    var subscriptionId: String = "",
-        val addedTime: Long = System.currentTimeMillis(),
+    val addedTime: Long = System.currentTimeMillis(),
-        var remarks: String = "",
+    var remarks: String = "",
-        val outboundBean: V2rayConfig.OutboundBean? = null,
+    val outboundBean: V2rayConfig.OutboundBean? = null,
-        var fullConfig: V2rayConfig? = null
+    var fullConfig: V2rayConfig? = null
 ) {
     companion object {
         fun create(configType: EConfigType): ServerConfig {
-            when(configType) {
+            when (configType) {
-                EConfigType.VMESS, EConfigType.VLESS ->
+                EConfigType.VMESS,
+                EConfigType.VLESS ->
                     return ServerConfig(
                         configType = configType,
                         outboundBean = V2rayConfig.OutboundBean(
                             protocol = configType.name.lowercase(),
                             settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                vnext = listOf(V2rayConfig.OutboundBean.OutSettingsBean.VnextBean(
+                                vnext = listOf(
-                                    users = listOf(V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean())))),
+                                    V2rayConfig.OutboundBean.OutSettingsBean.VnextBean(
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()))
+                                        users = listOf(V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean())
+                                    )
+                                )
+                            ),
+                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
+                        )
+                    )
+
                 EConfigType.CUSTOM ->
                     return ServerConfig(configType = configType)
-                EConfigType.SHADOWSOCKS, EConfigType.SOCKS, EConfigType.TROJAN ->
+
+                EConfigType.SHADOWSOCKS,
+                EConfigType.SOCKS,
+                EConfigType.HTTP,
+                EConfigType.TROJAN,
+                EConfigType.HYSTERIA2 ->
                     return ServerConfig(
                         configType = configType,
                         outboundBean = V2rayConfig.OutboundBean(
                             protocol = configType.name.lowercase(),
                             settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                servers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.ServersBean())),
+                                servers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.ServersBean())
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()))
+                            ),
+                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
+                        )
+                    )
+
                 EConfigType.WIREGUARD ->
                     return ServerConfig(
                         configType = configType,
-                        outboundBean =  V2rayConfig.OutboundBean(
+                        outboundBean = V2rayConfig.OutboundBean(
                             protocol = configType.name.lowercase(),
                             settings = V2rayConfig.OutboundBean.OutSettingsBean(
                                 secretKey = "",
                                 peers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean())
-                            )))
+                            )
+                        )
+                    )
             }
         }
     }
@@ -65,10 +83,4 @@ data class ServerConfig(
         }
         return mutableListOf()
     }
-
-    fun getV2rayPointDomainAndPort(): String {
-        val address = getProxyOutbound()?.getServerAddress().orEmpty()
-        val port = getProxyOutbound()?.getServerPort()
-        return Utils.getIpv6Address(address) + ":" + port
-    }
 }

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

@@ -1,4 +1,6 @@
 package com.v2ray.ang.dto
 
-data class ServersCache(val guid: String,
+data class ServersCache(
-                        val config: ServerConfig)
+    val guid: String,
+    val profile: ProfileItem
+)

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

@@ -8,5 +8,8 @@ data class SubscriptionItem(
     var lastUpdated: Long = -1,
     var autoUpdate: Boolean = false,
     val updateInterval: Int? = null,
+    var prevProfile: String? = null,
+    var nextProfile: String? = null,
+    var filter: String? = null,
 )
 

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

@@ -7,24 +7,26 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
+import com.v2ray.ang.util.Utils
 import java.lang.reflect.Type
 
 data class V2rayConfig(
-        var remarks: String? = null,
+    var remarks: String? = null,
-        var stats: Any? = null,
+    var stats: Any? = null,
-        val log: LogBean,
+    val log: LogBean,
-        var policy: PolicyBean?,
+    var policy: PolicyBean?,
-        val inbounds: ArrayList<InboundBean>,
+    val inbounds: ArrayList<InboundBean>,
-        var outbounds: ArrayList<OutboundBean>,
+    var outbounds: ArrayList<OutboundBean>,
-        var dns: DnsBean,
+    var dns: DnsBean,
-        val routing: RoutingBean,
+    val routing: RoutingBean,
-        val api: Any? = null,
+    val api: Any? = null,
-        val transport: Any? = null,
+    val transport: Any? = null,
-        val reverse: Any? = null,
+    val reverse: Any? = null,
-        var fakedns: Any? = null,
+    var fakedns: Any? = null,
-        val browserForwarder: Any? = null,
+    val browserForwarder: Any? = null,
-        var observatory: Any? = null,
+    var observatory: Any? = null,
-        var burstObservatory: Any? = null) {
+    var burstObservatory: Any? = null
+) {
     companion object {
         const val DEFAULT_PORT = 443
         const val DEFAULT_SECURITY = "auto"
@@ -36,210 +38,280 @@ data class V2rayConfig(
         const val HTTP = "http"
     }
 
-    data class LogBean(val access: String,
+    data class LogBean(
-                       val error: String,
+        val access: String,
-                       var loglevel: String?,
+        val error: String,
-                       val dnsLog: Boolean? = null)
+        var loglevel: String?,
+        val dnsLog: Boolean? = null
+    )
 
     data class InboundBean(
-            var tag: String,
+        var tag: String,
-            var port: Int,
+        var port: Int,
-            var protocol: String,
+        var protocol: String,
-            var listen: String? = null,
+        var listen: String? = null,
-            val settings: Any? = null,
+        val settings: Any? = null,
-            val sniffing: SniffingBean?,
+        val sniffing: SniffingBean?,
-            val streamSettings: Any? = null,
+        val streamSettings: Any? = null,
-            val allocate: Any? = null) {
+        val allocate: Any? = null
+    ) {
 
-        data class InSettingsBean(val auth: String? = null,
+        data class InSettingsBean(
-                                  val udp: Boolean? = null,
+            val auth: String? = null,
-                                  val userLevel: Int? = null,
+            val udp: Boolean? = null,
-                                  val address: String? = null,
+            val userLevel: Int? = null,
-                                  val port: Int? = null,
+            val address: String? = null,
-                                  val network: String? = null)
+            val port: Int? = null,
+            val network: String? = null
+        )
 
-        data class SniffingBean(var enabled: Boolean,
+        data class SniffingBean(
-                                val destOverride: ArrayList<String>,
+            var enabled: Boolean,
-                                val metadataOnly: Boolean? = null,
+            val destOverride: ArrayList<String>,
-                                var routeOnly: Boolean? = null)
+            val metadataOnly: Boolean? = null,
+            var routeOnly: Boolean? = null
+        )
     }
 
-    data class OutboundBean(var tag: String = "proxy",
+    data class OutboundBean(
-                            var protocol: String,
+        var tag: String = "proxy",
-                            var settings: OutSettingsBean? = null,
+        var protocol: String,
-                            var streamSettings: StreamSettingsBean? = null,
+        var settings: OutSettingsBean? = null,
-                            val proxySettings: Any? = null,
+        var streamSettings: StreamSettingsBean? = null,
-                            val sendThrough: String? = null,
+        val proxySettings: Any? = null,
-                            var mux: MuxBean? = MuxBean(false)) {
+        val sendThrough: String? = null,
+        var mux: MuxBean? = MuxBean(false)
+    ) {
 
-        data class OutSettingsBean(var vnext: List<VnextBean>? = null,
+        data class OutSettingsBean(
-                                   var fragment: FragmentBean? = null,
+            var vnext: List<VnextBean>? = null,
-                                   var servers: List<ServersBean>? = null,
+            var fragment: FragmentBean? = null,
-                /*Blackhole*/
+            var noises: List<NoiseBean>? = null,
-                                   var response: Response? = null,
+            var servers: List<ServersBean>? = null,
-                /*DNS*/
+            /*Blackhole*/
-                                   val network: String? = null,
+            var response: Response? = null,
-                                   var address: Any? = null,
+            /*DNS*/
-                                   val port: Int? = null,
+            val network: String? = null,
-                /*Freedom*/
+            var address: Any? = null,
-                                   var domainStrategy: String? = null,
+            val port: Int? = null,
-                                   val redirect: String? = null,
+            /*Freedom*/
-                                   val userLevel: Int? = null,
+            var domainStrategy: String? = null,
-                /*Loopback*/
+            val redirect: String? = null,
-                                   val inboundTag: String? = null,
+            val userLevel: Int? = null,
-                /*Wireguard*/
+            /*Loopback*/
-                                   var secretKey: String? = null,
+            val inboundTag: String? = null,
-                                   val peers: List<WireGuardBean>? = null,
+            /*Wireguard*/
-                                   var reserved: List<Int>? = null,
+            var secretKey: String? = null,
-                                   var mtu :Int? = null
+            val peers: List<WireGuardBean>? = null,
+            var reserved: List<Int>? = null,
+            var mtu: Int? = null,
+            var obfsPassword: String? = null,
         ) {
 
-            data class VnextBean(var address: String = "",
+            data class VnextBean(
-                                 var port: Int = DEFAULT_PORT,
+                var address: String = "",
-                                 var users: List<UsersBean>) {
+                var port: Int = DEFAULT_PORT,
+                var users: List<UsersBean>
+            ) {
 
-                data class UsersBean(var id: String = "",
+                data class UsersBean(
-                                     var alterId: Int? = null,
+                    var id: String = "",
-                                     var security: String = DEFAULT_SECURITY,
+                    var alterId: Int? = null,
-                                     var level: Int = DEFAULT_LEVEL,
+                    var security: String = DEFAULT_SECURITY,
-                                     var encryption: String = "",
+                    var level: Int = DEFAULT_LEVEL,
-                                     var flow: String = "")
+                    var encryption: String = "",
+                    var flow: String = ""
+                )
             }
 
-            data class FragmentBean(var packets: String? = null,
+            data class FragmentBean(
-                                 var length: String? = null,
+                var packets: String? = null,
-                                 var interval: String? = null)
+                var length: String? = null,
+                var interval: String? = null
+            )
 
-            data class ServersBean(var address: String = "",
+            data class NoiseBean(
-                                   var method: String = "chacha20-poly1305",
+                var type: String? = null,
-                                   var ota: Boolean = false,
+                var packet: String? = null,
-                                   var password: String = "",
+                var delay: String? = null
-                                   var port: Int = DEFAULT_PORT,
+            )
-                                   var level: Int = DEFAULT_LEVEL,
-                                   val email: String? = null,
-                                   var flow: String? = null,
-                                   val ivCheck: Boolean? = null,
-                                   var users: List<SocksUsersBean>? = null) {
 
-
+            data class ServersBean(
-                data class SocksUsersBean(var user: String = "",
+                var address: String = "",
-                                          var pass: String = "",
+                var method: String? = null,
-                                          var level: Int = DEFAULT_LEVEL)
+                var ota: Boolean = false,
+                var password: String? = null,
+                var port: Int = DEFAULT_PORT,
+                var level: Int = DEFAULT_LEVEL,
+                val email: String? = null,
+                var flow: String? = null,
+                val ivCheck: Boolean? = null,
+                var users: List<SocksUsersBean>? = null
+            ) {
+                data class SocksUsersBean(
+                    var user: String = "",
+                    var pass: String = "",
+                    var level: Int = DEFAULT_LEVEL
+                )
             }
 
             data class Response(var type: String)
 
-            data class WireGuardBean(var publicKey: String = "",
+            data class WireGuardBean(
-                                     var endpoint: String = "")
+                var publicKey: String = "",
+                var endpoint: String = ""
+            )
         }
 
-        data class StreamSettingsBean(var network: String = DEFAULT_NETWORK,
+        data class StreamSettingsBean(
-                                      var security: String = "",
+            var network: String = DEFAULT_NETWORK,
-                                      var tcpSettings: TcpSettingsBean? = null,
+            var security: String = "",
-                                      var kcpSettings: KcpSettingsBean? = null,
+            var tcpSettings: TcpSettingsBean? = null,
-                                      var wsSettings: WsSettingsBean? = null,
+            var kcpSettings: KcpSettingsBean? = null,
-                                      var httpupgradeSettings: HttpupgradeSettingsBean? = null,
+            var wsSettings: WsSettingsBean? = null,
-                                      var splithttpSettings: SplithttpSettingsBean? = null,
+            var httpupgradeSettings: HttpupgradeSettingsBean? = null,
-                                      var httpSettings: HttpSettingsBean? = null,
+            var splithttpSettings: SplithttpSettingsBean? = null,
-                                      var tlsSettings: TlsSettingsBean? = null,
+            var httpSettings: HttpSettingsBean? = null,
-                                      var quicSettings: QuicSettingBean? = null,
+            var tlsSettings: TlsSettingsBean? = null,
-                                      var realitySettings: TlsSettingsBean? = null,
+            var quicSettings: QuicSettingBean? = null,
-                                      var grpcSettings: GrpcSettingsBean? = null,
+            var realitySettings: TlsSettingsBean? = null,
-                                      val dsSettings: Any? = null,
+            var grpcSettings: GrpcSettingsBean? = null,
-                                      var sockopt: SockoptBean? = null
+            var hy2steriaSettings: Hy2steriaSettingsBean? = null,
+            val dsSettings: Any? = null,
+            var sockopt: SockoptBean? = null
         ) {
 
-            data class TcpSettingsBean(var header: HeaderBean = HeaderBean(),
+            data class TcpSettingsBean(
-                                       val acceptProxyProtocol: Boolean? = null) {
+                var header: HeaderBean = HeaderBean(),
-                data class HeaderBean(var type: String = "none",
+                val acceptProxyProtocol: Boolean? = null
-                                      var request: RequestBean? = null,
+            ) {
-                                      var response: Any? = null) {
+                data class HeaderBean(
-                    data class RequestBean(var path: List<String> = ArrayList(),
+                    var type: String = "none",
-                                           var headers: HeadersBean = HeadersBean(),
+                    var request: RequestBean? = null,
-                                           val version: String? = null,
+                    var response: Any? = null
-                                           val method: String? = null) {
+                ) {
-                        data class HeadersBean(var Host: List<String>? = ArrayList(),
+                    data class RequestBean(
-                                               @SerializedName("User-Agent")
+                        var path: List<String> = ArrayList(),
-                                               val userAgent: List<String>? = null,
+                        var headers: HeadersBean = HeadersBean(),
-                                               @SerializedName("Accept-Encoding")
+                        val version: String? = null,
-                                               val acceptEncoding: List<String>? = null,
+                        val method: String? = null
-                                               val Connection: List<String>? = null,
+                    ) {
-                                               val Pragma: String? = null)
+                        data class HeadersBean(
+                            var Host: List<String>? = ArrayList(),
+                            @SerializedName("User-Agent")
+                            val userAgent: List<String>? = null,
+                            @SerializedName("Accept-Encoding")
+                            val acceptEncoding: List<String>? = null,
+                            val Connection: List<String>? = null,
+                            val Pragma: String? = null
+                        )
                     }
                 }
             }
 
-            data class KcpSettingsBean(var mtu: Int = 1350,
+            data class KcpSettingsBean(
-                                       var tti: Int = 50,
+                var mtu: Int = 1350,
-                                       var uplinkCapacity: Int = 12,
+                var tti: Int = 50,
-                                       var downlinkCapacity: Int = 100,
+                var uplinkCapacity: Int = 12,
-                                       var congestion: Boolean = false,
+                var downlinkCapacity: Int = 100,
-                                       var readBufferSize: Int = 1,
+                var congestion: Boolean = false,
-                                       var writeBufferSize: Int = 1,
+                var readBufferSize: Int = 1,
-                                       var header: HeaderBean = HeaderBean(),
+                var writeBufferSize: Int = 1,
-                                       var seed: String? = null) {
+                var header: HeaderBean = HeaderBean(),
+                var seed: String? = null
+            ) {
                 data class HeaderBean(var type: String = "none")
             }
 
-            data class WsSettingsBean(var path: String = "",
+            data class WsSettingsBean(
-                                      var headers: HeadersBean = HeadersBean(),
+                var path: String = "",
-                                      val maxEarlyData: Int? = null,
+                var headers: HeadersBean = HeadersBean(),
-                                      val useBrowserForwarding: Boolean? = null,
+                val maxEarlyData: Int? = null,
-                                      val acceptProxyProtocol: Boolean? = null) {
+                val useBrowserForwarding: Boolean? = null,
+                val acceptProxyProtocol: Boolean? = null
+            ) {
                 data class HeadersBean(var Host: String = "")
             }
 
-            data class HttpupgradeSettingsBean(var path: String = "",
+            data class HttpupgradeSettingsBean(
-                                               var host: String = "",
+                var path: String = "",
-                                               val acceptProxyProtocol: Boolean? = null)
+                var host: String = "",
+                val acceptProxyProtocol: Boolean? = null
+            )
 
-            data class SplithttpSettingsBean(var path: String = "",
+            data class SplithttpSettingsBean(
-                                             var host: String = "",
+                var path: String = "",
-                                             val maxUploadSize: Int? = null,
+                var host: String = "",
-                                             val maxConcurrentUploads: Int? = null)
+                val maxUploadSize: Int? = null,
-            data class HttpSettingsBean(var host: List<String> = ArrayList(),
+                val maxConcurrentUploads: Int? = null
-                                        var path: String = "")
+            )
 
-            data class SockoptBean(var TcpNoDelay: Boolean? = null,
+            data class HttpSettingsBean(
-                                   var tcpKeepAliveIdle: Int? = null,
+                var host: List<String> = ArrayList(),
-                                   var tcpFastOpen: Boolean? = null,
+                var path: String = ""
-                                   var tproxy: String? = null,
+            )
-                                   var mark: Int? = null,
-                                   var dialerProxy: String? = null)
 
-            data class TlsSettingsBean(var allowInsecure: Boolean = false,
+            data class SockoptBean(
-                                       var serverName: String = "",
+                var TcpNoDelay: Boolean? = null,
-                                       val alpn: List<String>? = null,
+                var tcpKeepAliveIdle: Int? = null,
-                                       val minVersion: String? = null,
+                var tcpFastOpen: Boolean? = null,
-                                       val maxVersion: String? = null,
+                var tproxy: String? = null,
-                                       val preferServerCipherSuites: Boolean? = null,
+                var mark: Int? = null,
-                                       val cipherSuites: String? = null,
+                var dialerProxy: String? = null
-                                       val fingerprint: String? = null,
+            )
-                                       val certificates: List<Any>? = null,
-                                       val disableSystemRoot: 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",
+            data class TlsSettingsBean(
-                                       var key: String = "",
+                var allowInsecure: Boolean = false,
-                                       var header: HeaderBean = HeaderBean()) {
+                var serverName: String = "",
+                val alpn: List<String>? = null,
+                val minVersion: String? = null,
+                val maxVersion: String? = null,
+                val preferServerCipherSuites: Boolean? = null,
+                val cipherSuites: String? = null,
+                val fingerprint: String? = null,
+                val certificates: List<Any>? = null,
+                val disableSystemRoot: 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 = "",
+                var header: HeaderBean = HeaderBean()
+            ) {
                 data class HeaderBean(var type: String = "none")
             }
 
-            data class GrpcSettingsBean(var serviceName: String = "",
+            data class GrpcSettingsBean(
-                                        var authority: String? = null,
+                var serviceName: String = "",
-                                        var multiMode: Boolean? = null,
+                var authority: String? = null,
-                                        var idle_timeout: Int? = null,
+                var multiMode: Boolean? = null,
-                                        var health_check_timeout: Int? = null
+                var idle_timeout: Int? = null,
-                )
+                var health_check_timeout: Int? = null
+            )
 
-            fun populateTransportSettings(transport: String, headerType: String?, host: String?, path: String?, seed: String?,
+            data class Hy2steriaSettingsBean(
-                                          quicSecurity: String?, key: String?, mode: String?, serviceName: String?,
+                var password: String? = null,
-                                          authority: String?): String {
+                var use_udp_extension: Boolean? = true,
+                var congestion: Hy2CongestionBean? = null
+            ) {
+                data class Hy2CongestionBean(
+                    var type: String? = "bbr",
+                    var up_mbps: Int? = null,
+                    var down_mbps: Int? = null,
+                )
+            }
+
+            fun populateTransportSettings(
+                transport: String, headerType: String?, host: String?, path: String?, seed: String?,
+                quicSecurity: String?, key: String?, mode: String?, serviceName: String?,
+                authority: String?
+            ): String {
                 var sni = ""
                 network = transport
                 when (network) {
@@ -249,17 +321,18 @@ data class V2rayConfig(
                             tcpSetting.header.type = HTTP
                             if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
                                 val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
-                                requestObj.headers.Host = (host ?: "").split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                requestObj.headers.Host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                requestObj.path = (path ?: "").split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                requestObj.path = (path.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
                                 tcpSetting.header.request = requestObj
                                 sni = requestObj.headers.Host?.getOrNull(0) ?: sni
                             }
                         } else {
                             tcpSetting.header.type = "none"
-                            sni = host ?: ""
+                            sni = host.orEmpty()
                         }
                         tcpSettings = tcpSetting
                     }
+
                     "kcp" -> {
                         val kcpsetting = KcpSettingsBean()
                         kcpsetting.header.type = headerType ?: "none"
@@ -270,67 +343,75 @@ data class V2rayConfig(
                         }
                         kcpSettings = kcpsetting
                     }
+
                     "ws" -> {
                         val wssetting = WsSettingsBean()
-                        wssetting.headers.Host = host ?: ""
+                        wssetting.headers.Host = host.orEmpty()
                         sni = wssetting.headers.Host
                         wssetting.path = path ?: "/"
                         wsSettings = wssetting
                     }
+
                     "httpupgrade" -> {
                         val httpupgradeSetting = HttpupgradeSettingsBean()
-                        httpupgradeSetting.host = host ?: ""
+                        httpupgradeSetting.host = host.orEmpty()
                         sni = httpupgradeSetting.host
                         httpupgradeSetting.path = path ?: "/"
                         httpupgradeSettings = httpupgradeSetting
                     }
+
                     "splithttp" -> {
                         val splithttpSetting = SplithttpSettingsBean()
-                        splithttpSetting.host = host ?: ""
+                        splithttpSetting.host = host.orEmpty()
                         sni = splithttpSetting.host
                         splithttpSetting.path = path ?: "/"
                         splithttpSettings = splithttpSetting
                     }
+
                     "h2", "http" -> {
                         network = "h2"
                         val h2Setting = HttpSettingsBean()
-                        h2Setting.host = (host ?: "").split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                        h2Setting.host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
                         sni = h2Setting.host.getOrNull(0) ?: sni
                         h2Setting.path = path ?: "/"
                         httpSettings = h2Setting
                     }
+
                     "quic" -> {
                         val quicsetting = QuicSettingBean()
                         quicsetting.security = quicSecurity ?: "none"
-                        quicsetting.key = key ?: ""
+                        quicsetting.key = key.orEmpty()
                         quicsetting.header.type = headerType ?: "none"
                         quicSettings = quicsetting
                     }
+
                     "grpc" -> {
                         val grpcSetting = GrpcSettingsBean()
                         grpcSetting.multiMode = mode == "multi"
-                        grpcSetting.serviceName = serviceName ?: ""
+                        grpcSetting.serviceName = serviceName.orEmpty()
-                        grpcSetting.authority = authority ?: ""
+                        grpcSetting.authority = authority.orEmpty()
                         grpcSetting.idle_timeout = 60
                         grpcSetting.health_check_timeout = 20
-                        sni = authority ?: ""
+                        sni = authority.orEmpty()
                         grpcSettings = grpcSetting
                     }
                 }
                 return sni
             }
 
-            fun populateTlsSettings(streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?,
+            fun populateTlsSettings(
-                                    publicKey: String?, shortId: String?, spiderX: String?) {
+                streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?,
+                publicKey: String?, shortId: String?, spiderX: String?
+            ) {
                 security = streamSecurity
                 val tlsSetting = TlsSettingsBean(
-                        allowInsecure = allowInsecure,
+                    allowInsecure = allowInsecure,
-                        serverName = sni,
+                    serverName = sni,
-                        fingerprint = fingerprint,
+                    fingerprint = fingerprint,
-                        alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
-                        publicKey = publicKey,
+                    publicKey = publicKey,
-                        shortId = shortId,
+                    shortId = shortId,
-                        spiderX = spiderX
+                    spiderX = spiderX
                 )
                 if (security == TLS) {
                     tlsSettings = tlsSetting
@@ -342,18 +423,24 @@ data class V2rayConfig(
             }
         }
 
-        data class MuxBean(var enabled: Boolean,
+        data class MuxBean(
-                           var concurrency: Int = 8,
+            var enabled: Boolean,
-                           var xudpConcurrency: Int = 8,
+            var concurrency: Int = 8,
-                           var xudpProxyUDP443: String = "",)
+            var xudpConcurrency: Int = 8,
+            var xudpProxyUDP443: String = "",
+        )
 
         fun getServerAddress(): String? {
             if (protocol.equals(EConfigType.VMESS.name, true)
-                    || protocol.equals(EConfigType.VLESS.name, true)) {
+                || protocol.equals(EConfigType.VLESS.name, true)
+            ) {
                 return settings?.vnext?.get(0)?.address
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-                    || protocol.equals(EConfigType.SOCKS.name, true)
+                || protocol.equals(EConfigType.SOCKS.name, true)
-                    || protocol.equals(EConfigType.TROJAN.name, true)) {
+                || protocol.equals(EConfigType.HTTP.name, true)
+                || protocol.equals(EConfigType.TROJAN.name, true)
+                || protocol.equals(EConfigType.HYSTERIA2.name, true)
+            ) {
                 return settings?.servers?.get(0)?.address
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.peers?.get(0)?.endpoint?.substringBeforeLast(":")
@@ -363,11 +450,15 @@ data class V2rayConfig(
 
         fun getServerPort(): Int? {
             if (protocol.equals(EConfigType.VMESS.name, true)
-                    || protocol.equals(EConfigType.VLESS.name, true)) {
+                || protocol.equals(EConfigType.VLESS.name, true)
+            ) {
                 return settings?.vnext?.get(0)?.port
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-                    || protocol.equals(EConfigType.SOCKS.name, true)
+                || protocol.equals(EConfigType.SOCKS.name, true)
-                    || protocol.equals(EConfigType.TROJAN.name, true)) {
+                || protocol.equals(EConfigType.HTTP.name, true)
+                || protocol.equals(EConfigType.TROJAN.name, true)
+                || protocol.equals(EConfigType.HYSTERIA2.name, true)
+            ) {
                 return settings?.servers?.get(0)?.port
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.peers?.get(0)?.endpoint?.substringAfterLast(":")?.toInt()
@@ -375,14 +466,25 @@ data class V2rayConfig(
             return null
         }
 
+        fun getServerAddressAndPort(): String {
+            val address = getServerAddress().orEmpty()
+            val port = getServerPort()
+            return Utils.getIpv6Address(address) + ":" + port
+        }
+
         fun getPassword(): String? {
             if (protocol.equals(EConfigType.VMESS.name, true)
-                    || protocol.equals(EConfigType.VLESS.name, true)) {
+                || protocol.equals(EConfigType.VLESS.name, true)
+            ) {
                 return settings?.vnext?.get(0)?.users?.get(0)?.id
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-                    || protocol.equals(EConfigType.TROJAN.name, true)) {
+                || protocol.equals(EConfigType.TROJAN.name, true)
+                || protocol.equals(EConfigType.HYSTERIA2.name, true)
+            ) {
                 return settings?.servers?.get(0)?.password
-            } else if (protocol.equals(EConfigType.SOCKS.name, true)) {
+            } else if (protocol.equals(EConfigType.SOCKS.name, true)
+                || protocol.equals(EConfigType.HTTP.name, true)
+            ) {
                 return settings?.servers?.get(0)?.users?.get(0)?.pass
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.secretKey
@@ -401,59 +503,84 @@ data class V2rayConfig(
 
         fun getTransportSettingDetails(): List<String>? {
             if (protocol.equals(EConfigType.VMESS.name, true)
-                    || protocol.equals(EConfigType.VLESS.name, true)
+                || protocol.equals(EConfigType.VLESS.name, true)
-                    || protocol.equals(EConfigType.TROJAN.name, true)
+                || protocol.equals(EConfigType.TROJAN.name, true)
-                    || protocol.equals(EConfigType.SHADOWSOCKS.name, true)) {
+                || protocol.equals(EConfigType.SHADOWSOCKS.name, true)
+            ) {
                 val transport = streamSettings?.network ?: return null
                 return when (transport) {
                     "tcp" -> {
                         val tcpSetting = streamSettings?.tcpSettings ?: return null
-                        listOf(tcpSetting.header.type,
+                        listOf(
-                                tcpSetting.header.request?.headers?.Host?.joinToString().orEmpty(),
+                            tcpSetting.header.type,
-                                tcpSetting.header.request?.path?.joinToString().orEmpty())
+                            tcpSetting.header.request?.headers?.Host?.joinToString(",").orEmpty(),
+                            tcpSetting.header.request?.path?.joinToString(",").orEmpty()
+                        )
                     }
+
                     "kcp" -> {
                         val kcpSetting = streamSettings?.kcpSettings ?: return null
-                        listOf(kcpSetting.header.type,
+                        listOf(
-                                "",
+                            kcpSetting.header.type,
-                                kcpSetting.seed.orEmpty())
+                            "",
+                            kcpSetting.seed.orEmpty()
+                        )
                     }
+
                     "ws" -> {
                         val wsSetting = streamSettings?.wsSettings ?: return null
-                        listOf("",
+                        listOf(
-                                wsSetting.headers.Host,
+                            "",
-                                wsSetting.path)
+                            wsSetting.headers.Host,
+                            wsSetting.path
+                        )
                     }
+
                     "httpupgrade" -> {
                         val httpupgradeSetting = streamSettings?.httpupgradeSettings ?: return null
-                        listOf("",
+                        listOf(
+                            "",
                             httpupgradeSetting.host,
-                            httpupgradeSetting.path)
+                            httpupgradeSetting.path
+                        )
                     }
+
                     "splithttp" -> {
                         val splithttpSetting = streamSettings?.splithttpSettings ?: return null
-                        listOf("",
+                        listOf(
+                            "",
                             splithttpSetting.host,
-                            splithttpSetting.path)
+                            splithttpSetting.path
+                        )
                     }
+
                     "h2" -> {
                         val h2Setting = streamSettings?.httpSettings ?: return null
-                        listOf("",
+                        listOf(
-                                h2Setting.host.joinToString(),
+                            "",
-                                h2Setting.path)
+                            h2Setting.host.joinToString(","),
+                            h2Setting.path
+                        )
                     }
+
                     "quic" -> {
                         val quicSetting = streamSettings?.quicSettings ?: return null
-                        listOf(quicSetting.header.type,
+                        listOf(
-                                quicSetting.security,
+                            quicSetting.header.type,
-                                quicSetting.key)
+                            quicSetting.security,
+                            quicSetting.key
+                        )
                     }
+
                     "grpc" -> {
                         val grpcSetting = streamSettings?.grpcSettings ?: return null
-                        listOf(if (grpcSetting.multiMode == true) "multi" else "gun",
+                        listOf(
-                                grpcSetting.authority ?: "",
+                            if (grpcSetting.multiMode == true) "multi" else "gun",
-                                grpcSetting.serviceName)
+                            grpcSetting.authority.orEmpty(),
+                            grpcSetting.serviceName
+                        )
                     }
+
                     else -> null
                 }
             }
@@ -461,59 +588,70 @@ data class V2rayConfig(
         }
     }
 
-    data class DnsBean(var servers: ArrayList<Any>? = null,
+    data class DnsBean(
-                       var hosts: Map<String, Any>? = null,
+        var servers: ArrayList<Any>? = null,
-                       val clientIp: String? = null,
+        var hosts: Map<String, Any>? = null,
-                       val disableCache: Boolean? = null,
+        val clientIp: String? = null,
-                       val queryStrategy: String? = null,
+        val disableCache: Boolean? = null,
-                       val tag: String? = null
+        val queryStrategy: String? = null,
+        val tag: String? = null
     ) {
-        data class ServersBean(var address: String = "",
+        data class ServersBean(
-                               var port: Int? = null,
+            var address: String = "",
-                               var domains: List<String>? = null,
+            var port: Int? = null,
-                               var expectIPs: List<String>? = null,
+            var domains: List<String>? = null,
-                               val clientIp: String? = null)
+            var expectIPs: List<String>? = null,
-    }
+            val clientIp: String? = null
-
-    data class RoutingBean(var domainStrategy: String,
-                           var domainMatcher: String? = null,
-                           var rules: ArrayList<RulesBean>,
-                           val balancers: List<Any>? = null) {
-
-        data class RulesBean(
-                             var ip: ArrayList<String>? = null,
-                             var domain: ArrayList<String>? = null,
-                             var outboundTag: String = "",
-                             var balancerTag: String? = null,
-                             var port: String? = null,
-                             val sourcePort: String? = null,
-                             val network: String? = null,
-                             val source: List<String>? = null,
-                             val user: List<String>? = null,
-                             var inboundTag: List<String>? = null,
-                             val protocol: List<String>? = null,
-                             val attrs: String? = null,
-                             val domainMatcher: String? = null
         )
     }
 
-    data class PolicyBean(var levels: Map<String, LevelBean>,
+    data class RoutingBean(
-                          var system: Any? = null) {
+        var domainStrategy: String,
-        data class LevelBean(
+        var domainMatcher: String? = null,
-                var handshake: Int? = null,
+        var rules: ArrayList<RulesBean>,
-                var connIdle: Int? = null,
+        val balancers: List<Any>? = null
-                var uplinkOnly: Int? = null,
+    ) {
-                var downlinkOnly: Int? = null,
+
-                val statsUserUplink: Boolean? = null,
+        data class RulesBean(
-                val statsUserDownlink: Boolean? = null,
+            var type: String = "field",
-                var bufferSize: Int? = null)
+            var ip: ArrayList<String>? = null,
+            var domain: ArrayList<String>? = null,
+            var outboundTag: String = "",
+            var balancerTag: String? = null,
+            var port: String? = null,
+            val sourcePort: String? = null,
+            val network: String? = null,
+            val source: List<String>? = null,
+            val user: List<String>? = null,
+            var inboundTag: List<String>? = null,
+            val protocol: List<String>? = null,
+            val attrs: String? = null,
+            val domainMatcher: String? = null
+        )
     }
 
-    data class FakednsBean(var ipPool: String = "198.18.0.0/15",
+    data class PolicyBean(
-                           var poolSize: Int = 10000) // roughly 10 times smaller than total ip pool
+        var levels: Map<String, LevelBean>,
+        var system: Any? = null
+    ) {
+        data class LevelBean(
+            var handshake: Int? = null,
+            var connIdle: Int? = null,
+            var uplinkOnly: Int? = null,
+            var downlinkOnly: Int? = null,
+            val statsUserUplink: Boolean? = null,
+            val statsUserDownlink: Boolean? = null,
+            var bufferSize: Int? = null
+        )
+    }
+
+    data class FakednsBean(
+        var ipPool: String = "198.18.0.0/15",
+        var poolSize: Int = 10000
+    ) // roughly 10 times smaller than total ip pool
 
     fun getProxyOutbound(): OutboundBean? {
-        outbounds?.forEach { outbound ->
+        outbounds.forEach { outbound ->
             EConfigType.entries.forEach {
                 if (outbound.protocol.equals(it.name, true)) {
                     return outbound
@@ -525,13 +663,13 @@ data class V2rayConfig(
 
     fun toPrettyPrinting(): String {
         return GsonBuilder()
-                .setPrettyPrinting()
+            .setPrettyPrinting()
-                .disableHtmlEscaping()
+            .disableHtmlEscaping()
-                .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
+            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
-                        object : TypeToken<Double>() {}.type,
+                object : TypeToken<Double>() {}.type,
-                        JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
+                JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
-                )
+            )
-                .create()
+            .create()
-                .toJson(this)
+            .toJson(this)
     }
-}
+}

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

@@ -1,17 +1,19 @@
 package com.v2ray.ang.dto
 
-data class VmessQRCode(var v: String = "",
+data class VmessQRCode(
-                       var ps: String = "",
+    var v: String = "",
-                       var add: String = "",
+    var ps: String = "",
-                       var port: String = "",
+    var add: String = "",
-                       var id: String = "",
+    var port: String = "",
-                       var aid: String = "0",
+    var id: String = "",
-                       var scy: String = "",
+    var aid: String = "0",
-                       var net: String = "",
+    var scy: String = "",
-                       var type: String = "",
+    var net: String = "",
-                       var host: String = "",
+    var type: String = "",
-                       var path: String = "",
+    var host: String = "",
-                       var tls: String = "",
+    var path: String = "",
-                       var sni: String = "",
+    var tls: String = "",
-                       var alpn: String = "",
+    var sni: String = "",
-                       var fp: String = "")
+    var alpn: String = "",
+    var fp: String = ""
+)

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

@@ -1,23 +1,28 @@
 package com.v2ray.ang.extension
 
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Build
+import android.os.Bundle
 import android.widget.Toast
 import com.v2ray.ang.AngApplication
 import me.drakeet.support.toast.ToastCompat
 import org.json.JSONObject
+import java.io.Serializable
 import java.net.URI
 import java.net.URLConnection
 
-val Context.v2RayApplication: AngApplication
+val Context.v2RayApplication: AngApplication?
-    get() = applicationContext as AngApplication
+    get() = applicationContext as? AngApplication
 
 fun Context.toast(message: Int) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).apply { show() }
+    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
 }
 
 fun Context.toast(message: CharSequence) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).apply { show() }
+    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
 }
 
 fun JSONObject.putOpt(pair: Pair<String, Any?>) {
@@ -34,26 +39,14 @@ const val DIVISOR = 1024.0
 fun Long.toSpeedString(): String = this.toTrafficString() + "/s"
 
 fun Long.toTrafficString(): String {
-    if (this < THRESHOLD) {
+    val units = arrayOf("B", "KB", "MB", "GB", "TB", "PB")
-        return "$this B"
+    var size = this.toDouble()
+    var unitIndex = 0
+    while (size >= THRESHOLD && unitIndex < units.size - 1) {
+        size /= DIVISOR
+        unitIndex++
     }
-    val kb = this / DIVISOR
+    return String.format("%.1f %s", size, units[unitIndex])
-    if (kb < THRESHOLD) {
-        return "${String.format("%.1f KB", kb)}"
-    }
-    val mb = kb / DIVISOR
-    if (mb < THRESHOLD) {
-        return "${String.format("%.1f MB", mb)}"
-    }
-    val gb = mb / DIVISOR
-    if (gb < THRESHOLD) {
-        return "${String.format("%.1f GB", gb)}"
-    }
-    val tb = gb / DIVISOR
-    if (tb < THRESHOLD) {
-        return "${String.format("%.1f TB", tb)}"
-    }
-    return String.format("%.1f PB", tb / DIVISOR)
 }
 
 val URLConnection.responseLength: Long
@@ -64,6 +57,40 @@ val URLConnection.responseLength: Long
     }
 
 val URI.idnHost: String
-    get() = host?.replace("[", "")?.replace("]", "") ?: ""
+    get() = host?.replace("[", "")?.replace("]", "").orEmpty()
 
 fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "")
+
+fun String.toLongEx(): Long = toLongOrNull() ?: 0
+
+fun Context.listenForPackageChanges(onetime: Boolean = true, callback: () -> Unit) =
+    object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            callback()
+            if (onetime) context.unregisterReceiver(this)
+        }
+    }.apply {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(this, IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addDataScheme("package")
+            }, Context.RECEIVER_EXPORTED)
+        } else {
+            registerReceiver(this, IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addDataScheme("package")
+            })
+        }
+    }
+
+inline fun <reified T : Serializable> Bundle.serializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as? T
+}
+
+inline fun <reified T : Serializable> Intent.serializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/NativePlugin.kt

@@ -0,0 +1,32 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
+ * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+import android.content.pm.ResolveInfo
+
+class NativePlugin(resolveInfo: ResolveInfo) : ResolvedPlugin(resolveInfo) {
+    init {
+        check(resolveInfo.providerInfo != null)
+    }
+
+    override val componentInfo get() = resolveInfo.providerInfo!!
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/Plugin.kt

@@ -0,0 +1,43 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
+ * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+import android.graphics.drawable.Drawable
+
+abstract class Plugin {
+    abstract val id: String
+    abstract val label: CharSequence
+    abstract val version: Int
+    abstract val versionName: String
+    open val icon: Drawable? get() = null
+    open val defaultConfig: String? get() = null
+    open val packageName: String get() = ""
+    open val directBootAware: Boolean get() = true
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        return id == (other as Plugin).id
+    }
+
+    override fun hashCode() = id.hashCode()
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/PluginContract.kt

@@ -0,0 +1,33 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+object PluginContract {
+
+    const val ACTION_NATIVE_PLUGIN = "io.nekohasekai.sagernet.plugin.ACTION_NATIVE_PLUGIN"
+    const val EXTRA_ENTRY = "io.nekohasekai.sagernet.plugin.EXTRA_ENTRY"
+    const val METADATA_KEY_ID = "io.nekohasekai.sagernet.plugin.id"
+    const val METADATA_KEY_EXECUTABLE_PATH = "io.nekohasekai.sagernet.plugin.executable_path"
+    const val METHOD_GET_EXECUTABLE = "sagernet:getExecutable"
+
+    const val COLUMN_PATH = "path"
+    const val COLUMN_MODE = "mode"
+    const val SCHEME = "plugin"
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/PluginList.kt

@@ -0,0 +1,53 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
+ * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import com.v2ray.ang.AngApplication
+
+class PluginList : ArrayList<Plugin>() {
+    init {
+        addAll(
+            AngApplication.application.packageManager.queryIntentContentProviders(
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA)
+            .filter { it.providerInfo.exported }.map { NativePlugin(it) })
+    }
+
+    val lookup = mutableMapOf<String, Plugin>().apply {
+        for (plugin in this@PluginList.toList()) {
+            fun check(old: Plugin?) {
+                if (old != null && old != plugin) {
+                    this@PluginList.remove(old)
+                }
+               /* if (old != null && old !== plugin) {
+                    val packages = this@PluginList.filter { it.id == plugin.id }
+                        .joinToString { it.packageName }
+                    val message = "Conflicting plugins found from: $packages"
+                    Toast.makeText(SagerNet.application, message, Toast.LENGTH_LONG).show()
+                    throw IllegalStateException(message)
+                }*/
+            }
+            check(put(plugin.id, plugin))
+        }
+    }
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/PluginManager.kt

@@ -0,0 +1,219 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-AngApplication@sekai.icu>             *
+ * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
+ * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.ContentResolver
+import android.content.Intent
+import android.content.pm.ComponentInfo
+import android.content.pm.PackageManager
+import android.content.pm.ProviderInfo
+import android.database.Cursor
+import android.net.Uri
+import android.os.Build
+import android.system.Os
+import android.widget.Toast
+import androidx.core.os.bundleOf
+import com.v2ray.ang.AngApplication
+import com.v2ray.ang.extension.listenForPackageChanges
+import com.v2ray.ang.plugin.PluginContract.METADATA_KEY_ID
+import java.io.File
+import java.io.FileNotFoundException
+
+object PluginManager {
+
+    class PluginNotFoundException(val plugin: String) : FileNotFoundException(plugin)
+    private var receiver: BroadcastReceiver? = null
+    private var cachedPlugins: PluginList? = null
+    fun fetchPlugins() = synchronized(this) {
+        if (receiver == null) receiver = AngApplication.application.listenForPackageChanges {
+            synchronized(this) {
+                receiver = null
+                cachedPlugins = null
+            }
+        }
+        if (cachedPlugins == null) cachedPlugins = PluginList()
+        cachedPlugins!!
+    }
+
+    private fun buildUri(id: String, authority: String) = Uri.Builder()
+        .scheme(PluginContract.SCHEME)
+        .authority(authority)
+        .path("/$id")
+        .build()
+
+    data class InitResult(
+        val path: String,
+    )
+
+    @Throws(Throwable::class)
+    fun init(pluginId: String): InitResult? {
+        if (pluginId.isEmpty()) return null
+        var throwable: Throwable? = null
+
+        try {
+            val result = initNative(pluginId)
+            if (result != null) return result
+        } catch (t: Throwable) {
+            if (throwable == null) throwable = t  //Logs.w(t)
+        }
+
+        throw throwable ?: PluginNotFoundException(pluginId)
+    }
+
+    private fun initNative(pluginId: String): InitResult? {
+        var flags = PackageManager.GET_META_DATA
+        if (Build.VERSION.SDK_INT >= 24) {
+            flags =
+                flags or PackageManager.MATCH_DIRECT_BOOT_UNAWARE or PackageManager.MATCH_DIRECT_BOOT_AWARE
+        }
+        var providers = AngApplication.application.packageManager.queryIntentContentProviders(
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "com.github.dyhkwong.AngApplication")), flags)
+            .filter { it.providerInfo.exported }
+        if (providers.isEmpty()) {
+            providers = AngApplication.application.packageManager.queryIntentContentProviders(
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "io.nekohasekai.AngApplication")), flags)
+            .filter { it.providerInfo.exported }
+        }
+        if (providers.isEmpty()) {
+            providers = AngApplication.application.packageManager.queryIntentContentProviders(
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "moe.matsuri.lite")), flags)
+            .filter { it.providerInfo.exported }
+        }
+        if (providers.isEmpty()) {
+            providers = AngApplication.application.packageManager.queryIntentContentProviders(
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "fr.husi")), flags)
+            .filter { it.providerInfo.exported }
+        }
+        if (providers.isEmpty()) {
+            providers = AngApplication.application.packageManager.queryIntentContentProviders(
+                Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
+            ).filter {
+                it.providerInfo.exported &&
+                it.providerInfo.metaData.containsKey(METADATA_KEY_ID) &&
+                it.providerInfo.metaData.getString(METADATA_KEY_ID) == pluginId
+            }
+            if (providers.size > 1) {
+                providers = listOf(providers[0]) // What if there is more than one?
+            }
+        }
+        if (providers.isEmpty()) return null
+        if (providers.size > 1) {
+            val message =
+                "Conflicting plugins found from: ${providers.joinToString { it.providerInfo.packageName }}"
+            Toast.makeText(AngApplication.application, message, Toast.LENGTH_LONG).show()
+            throw IllegalStateException(message)
+        }
+        val provider = providers.single().providerInfo
+        var failure: Throwable? = null
+        try {
+            initNativeFaster(provider)?.also { return InitResult(it) }
+        } catch (t: Throwable) {
+         //   Logs.w("Initializing native plugin faster mode failed")
+            failure = t
+        }
+
+        val uri = Uri.Builder().apply {
+            scheme(ContentResolver.SCHEME_CONTENT)
+            authority(provider.authority)
+        }.build()
+        try {
+            return initNativeFast(AngApplication.application.contentResolver,
+                pluginId,
+                uri)?.let { InitResult(it) }
+        } catch (t: Throwable) {
+          //  Logs.w("Initializing native plugin fast mode failed")
+            failure?.also { t.addSuppressed(it) }
+            failure = t
+        }
+
+        try {
+            return initNativeSlow(AngApplication.application.contentResolver,
+                pluginId,
+                uri)?.let { InitResult(it) }
+        } catch (t: Throwable) {
+            failure?.also { t.addSuppressed(it) }
+            throw t
+        }
+    }
+
+    private fun initNativeFaster(provider: ProviderInfo): String? {
+        return provider.loadString(PluginContract.METADATA_KEY_EXECUTABLE_PATH)
+            ?.let { relativePath ->
+                File(provider.applicationInfo.nativeLibraryDir).resolve(relativePath).apply {
+                    check(canExecute())
+                }.absolutePath
+            }
+    }
+
+    private fun initNativeFast(cr: ContentResolver, pluginId: String, uri: Uri): String? {
+        return cr.call(uri, PluginContract.METHOD_GET_EXECUTABLE, null, bundleOf())
+            ?.getString(PluginContract.EXTRA_ENTRY)?.also {
+                check(File(it).canExecute())
+            }
+    }
+
+    @SuppressLint("Recycle")
+    private fun initNativeSlow(cr: ContentResolver, pluginId: String, uri: Uri): String? {
+        var initialized = false
+        fun entryNotFound(): Nothing =
+            throw IndexOutOfBoundsException("Plugin entry binary not found")
+
+        val pluginDir = File(AngApplication.application.noBackupFilesDir, "plugin")
+        (cr.query(uri,
+            arrayOf(PluginContract.COLUMN_PATH, PluginContract.COLUMN_MODE),
+            null,
+            null,
+            null)
+            ?: return null).use { cursor ->
+            if (!cursor.moveToFirst()) entryNotFound()
+            pluginDir.deleteRecursively()
+            if (!pluginDir.mkdirs()) throw FileNotFoundException("Unable to create plugin directory")
+            val pluginDirPath = pluginDir.absolutePath + '/'
+            do {
+                val path = cursor.getString(0)
+                val file = File(pluginDir, path)
+                check(file.absolutePath.startsWith(pluginDirPath))
+                cr.openInputStream(uri.buildUpon().path(path).build())!!.use { inStream ->
+                    file.outputStream().use { outStream -> inStream.copyTo(outStream) }
+                }
+                Os.chmod(file.absolutePath, when (cursor.getType(1)) {
+                    Cursor.FIELD_TYPE_INTEGER -> cursor.getInt(1)
+                    Cursor.FIELD_TYPE_STRING -> cursor.getString(1).toInt(8)
+                    else -> throw IllegalArgumentException("File mode should be of type int")
+                })
+                if (path == pluginId) initialized = true
+            } while (cursor.moveToNext())
+        }
+        if (!initialized) entryNotFound()
+        return File(pluginDir, pluginId).absolutePath
+    }
+
+    fun ComponentInfo.loadString(key: String) = when (val value = metaData.get(key)) {
+        is String -> value
+        is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo)
+            .getString(value)
+        null -> null
+        else -> error("meta-data $key has invalid type ${value.javaClass}")
+    }
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/plugin/ResolvedPlugin.kt

@@ -0,0 +1,45 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
+ * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
+ *                                                                            *
+ * This program is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by       *
+ * the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                       *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package com.v2ray.ang.plugin
+
+import android.content.pm.ComponentInfo
+import android.content.pm.ResolveInfo
+import android.graphics.drawable.Drawable
+import android.os.Build
+import com.v2ray.ang.AngApplication
+import com.v2ray.ang.plugin.PluginManager.loadString
+
+abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin() {
+    protected abstract val componentInfo: ComponentInfo
+
+    override val id by lazy { componentInfo.loadString(PluginContract.METADATA_KEY_ID)!! }
+    override val version by lazy {
+        AngApplication.application.getPackageInfo(componentInfo.packageName).versionCode
+    }
+    override val versionName: String by lazy {
+        AngApplication.application.getPackageInfo(componentInfo.packageName).versionName!!
+    }
+    override val label: CharSequence get() = resolveInfo.loadLabel(AngApplication.application.packageManager)
+    override val icon: Drawable get() = resolveInfo.loadIcon(AngApplication.application.packageManager)
+    override val packageName: String get() = componentInfo.packageName
+    override val directBootAware get() = Build.VERSION.SDK_INT < 24 || componentInfo.directBootAware
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/BootReceiver.kt

@@ -0,0 +1,18 @@
+package com.v2ray.ang.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.util.MmkvManager
+
+class BootReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if (Intent.ACTION_BOOT_COMPLETED == intent?.action && MmkvManager.decodeStartOnBoot()) {
+            if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+                return
+            }
+            V2RayServiceManager.startV2Ray(context!!)
+        }
+    }
+}

V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/TaskerReceiver.kt

@@ -4,15 +4,12 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.MmkvManager
-
 import com.v2ray.ang.util.Utils
 
 class TaskerReceiver : BroadcastReceiver() {
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
 
     override fun onReceive(context: Context, intent: Intent?) {
 
@@ -27,7 +24,7 @@ class TaskerReceiver : BroadcastReceiver() {
                 if (guid == AppConfig.TASKER_DEFAULT_GUID) {
                     Utils.startVServiceFromToggle(context)
                 } else {
-                    mainStorage?.encode(MmkvManager.KEY_SELECTED_SERVER, guid)
+                    MmkvManager.setSelectServer(guid)
                     V2RayServiceManager.startV2Ray(context)
                 }
             } else {

V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt

@@ -35,7 +35,8 @@ class WidgetProvider : AppWidgetProvider() {
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             } else {
                 PendingIntent.FLAG_UPDATE_CURRENT
-            })
+            }
+        )
         remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent)
         if (isRunning) {
             remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stop_24dp)
@@ -65,12 +66,17 @@ class WidgetProvider : AppWidgetProvider() {
             AppWidgetManager.getInstance(context)?.let { manager ->
                 when (intent.getIntExtra("key", 0)) {
                     AppConfig.MSG_STATE_RUNNING, AppConfig.MSG_STATE_START_SUCCESS -> {
-                        updateWidgetBackground(context, manager, manager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java)),
+                        updateWidgetBackground(
-                                true)
+                            context, manager, manager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java)),
+                            true
+                        )
                     }
+
                     AppConfig.MSG_STATE_NOT_RUNNING, AppConfig.MSG_STATE_START_FAILURE, AppConfig.MSG_STATE_STOP_SUCCESS -> {
-                        updateWidgetBackground(context, manager, manager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java)),
+                        updateWidgetBackground(
-                                false)
+                            context, manager, manager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java)),
+                            false
+                        )
                     }
                 }
             }

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

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

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

@@ -58,6 +58,7 @@ class QSTileService : TileService() {
             Tile.STATE_INACTIVE -> {
                 Utils.startVServiceFromToggle(this)
             }
+
             Tile.STATE_ACTIVE -> {
                 Utils.stopVService(this)
             }
@@ -67,22 +68,26 @@ class QSTileService : TileService() {
     private var mMsgReceive: BroadcastReceiver? = null
 
     private class ReceiveMessageHandler(context: QSTileService) : BroadcastReceiver() {
-        internal var mReference: SoftReference<QSTileService> = SoftReference(context)
+        var mReference: SoftReference<QSTileService> = SoftReference(context)
         override fun onReceive(ctx: Context?, intent: Intent?) {
             val context = mReference.get()
             when (intent?.getIntExtra("key", 0)) {
                 AppConfig.MSG_STATE_RUNNING -> {
                     context?.setState(Tile.STATE_ACTIVE)
                 }
+
                 AppConfig.MSG_STATE_NOT_RUNNING -> {
                     context?.setState(Tile.STATE_INACTIVE)
                 }
+
                 AppConfig.MSG_STATE_START_SUCCESS -> {
                     context?.setState(Tile.STATE_ACTIVE)
                 }
+
                 AppConfig.MSG_STATE_START_FAILURE -> {
                     context?.setState(Tile.STATE_INACTIVE)
                 }
+
                 AppConfig.MSG_STATE_STOP_SUCCESS -> {
                     context?.setState(Tile.STATE_INACTIVE)
                 }

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

@@ -11,21 +11,23 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
+import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
 import com.v2ray.ang.util.AngConfigManager
+import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.Utils
 
 object SubscriptionUpdater {
 
-    const val notificationChannel = "subscription_update_channel"
 
     class UpdateTask(context: Context, params: WorkerParameters) :
         CoroutineWorker(context, params) {
 
         private val notificationManager = NotificationManagerCompat.from(applicationContext)
         private val notification =
-            NotificationCompat.Builder(applicationContext, notificationChannel)
+            NotificationCompat.Builder(applicationContext, SUBSCRIPTION_UPDATE_CHANNEL)
                 .setWhen(0)
                 .setTicker("Update")
                 .setContentTitle(context.getString(R.string.title_pref_auto_update_subscription))
@@ -39,15 +41,15 @@ object SubscriptionUpdater {
 
             val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
 
-            for (i in subs) {
+            for (sub in subs) {
-                val subscription = i.second
+                val subItem = sub.second
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    notification.setChannelId(notificationChannel)
+                    notification.setChannelId(SUBSCRIPTION_UPDATE_CHANNEL)
                     val channel =
                         NotificationChannel(
-                            notificationChannel,
+                            SUBSCRIPTION_UPDATE_CHANNEL,
-                            "Subscription Update Service",
+                            SUBSCRIPTION_UPDATE_CHANNEL_NAME,
                             NotificationManager.IMPORTANCE_MIN
                         )
                     notificationManager.createNotificationChannel(channel)
@@ -55,11 +57,10 @@ object SubscriptionUpdater {
                 notificationManager.notify(3, notification.build())
                 Log.d(
                     AppConfig.ANG_PACKAGE,
-                    "subscription automatic update: ---${subscription.remarks}"
+                    "subscription automatic update: ---${subItem.remarks}"
                 )
-                val configs = Utils.getUrlContentWithCustomUserAgent(subscription.url)
+                updateConfigViaSub(Pair(sub.first, subItem))
-                AngConfigManager.importBatchConfig(configs, i.first, false)
+                notification.setContentText("Updating ${subItem.remarks}")
-                notification.setContentText("Updating ${subscription.remarks}")
             }
             notificationManager.cancel(3)
             return Result.success()

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

@@ -49,7 +49,7 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
-            MyContextWrapper.wrap(newBase,  Utils.getLocale(newBase))
+            MyContextWrapper.wrap(newBase, Utils.getLocale())
         }
         super.attachBaseContext(context)
     }

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

@@ -13,10 +13,10 @@ import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
+import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.extension.toSpeedString
@@ -24,17 +24,19 @@ import com.v2ray.ang.extension.toast
 import com.v2ray.ang.ui.MainActivity
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.util.V2rayConfigUtil
 import go.Seq
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.Disposable
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import libv2ray.Libv2ray
 import libv2ray.V2RayPoint
 import libv2ray.V2RayVPNServiceSupportsSet
-import rx.Observable
-import rx.Subscription
 import java.lang.ref.SoftReference
 import kotlin.math.min
 
@@ -46,8 +48,6 @@ object V2RayServiceManager {
 
     val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
     private val mMsgReceive = ReceiveMessageHandler()
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     var serviceControl: SoftReference<ServiceControl>? = null
         set(value) {
@@ -59,12 +59,12 @@ object V2RayServiceManager {
 
     private var lastQueryTime = 0L
     private var mBuilder: NotificationCompat.Builder? = null
-    private var mSubscription: Subscription? = null
+    private var mDisposable: Disposable? = null
     private var mNotificationManager: NotificationManager? = null
 
     fun startV2Ray(context: Context) {
         if (v2rayPoint.isRunning) return
-        val guid = mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER) ?: return
+        val guid = MmkvManager.getSelectServer() ?: return
         val result = V2rayConfigUtil.getV2rayConfig(context, guid)
         if (!result.status) return
 
@@ -73,7 +73,7 @@ object V2RayServiceManager {
         } else {
             context.toast(R.string.toast_services_start)
         }
-        val intent = if (settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: "VPN" == "VPN") {
+        val intent = if ((settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
             Intent(context.applicationContext, V2RayVpnService::class.java)
         } else {
             Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
@@ -108,13 +108,11 @@ object V2RayServiceManager {
         }
 
         override fun onEmitStatus(l: Long, s: String?): Long {
-            //Logger.d(s)
             return 0
         }
 
         override fun setup(s: String): Long {
             val serviceControl = serviceControl?.get() ?: return -1
-            //Logger.d(s)
             return try {
                 serviceControl.startService()
                 lastQueryTime = System.currentTimeMillis()
@@ -129,7 +127,7 @@ object V2RayServiceManager {
 
     fun startV2rayPoint() {
         val service = serviceControl?.get()?.getService() ?: return
-        val guid = mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER) ?: return
+        val guid = MmkvManager.getSelectServer() ?: return
         val config = MmkvManager.decodeServerConfig(guid) ?: return
         if (v2rayPoint.isRunning) {
             return
@@ -153,7 +151,7 @@ object V2RayServiceManager {
         }
 
         v2rayPoint.configureFileContent = result.content
-        v2rayPoint.domainName = config.getV2rayPointDomainAndPort()
+        v2rayPoint.domainName = result.domainPort
         currentConfig = config
 
         try {
@@ -165,6 +163,8 @@ object V2RayServiceManager {
         if (v2rayPoint.isRunning) {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
             showNotification()
+
+            PluginUtil.runPlugin(service, config, result.domainPort)
         } else {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
             cancelNotification()
@@ -175,7 +175,7 @@ object V2RayServiceManager {
         val service = serviceControl?.get()?.getService() ?: return
 
         if (v2rayPoint.isRunning) {
-            GlobalScope.launch(Dispatchers.Default) {
+            CoroutineScope(Dispatchers.IO).launch {
                 try {
                     v2rayPoint.stopLoop()
                 } catch (e: Exception) {
@@ -192,6 +192,7 @@ object V2RayServiceManager {
         } catch (e: Exception) {
             Log.d(ANG_PACKAGE, e.toString())
         }
+        PluginUtil.stopPlugin()
     }
 
     private class ReceiveMessageHandler : BroadcastReceiver() {
@@ -199,25 +200,29 @@ object V2RayServiceManager {
             val serviceControl = serviceControl?.get() ?: return
             when (intent?.getIntExtra("key", 0)) {
                 AppConfig.MSG_REGISTER_CLIENT -> {
-                    //Logger.e("ReceiveMessageHandler", intent?.getIntExtra("key", 0).toString())
                     if (v2rayPoint.isRunning) {
                         MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
                     } else {
                         MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_NOT_RUNNING, "")
                     }
                 }
+
                 AppConfig.MSG_UNREGISTER_CLIENT -> {
                     // nothing to do
                 }
+
                 AppConfig.MSG_STATE_START -> {
                     // nothing to do
                 }
+
                 AppConfig.MSG_STATE_STOP -> {
                     serviceControl.stopService()
                 }
+
                 AppConfig.MSG_STATE_RESTART -> {
                     startV2rayPoint()
                 }
+
                 AppConfig.MSG_MEASURE_DELAY -> {
                     measureV2rayDelay()
                 }
@@ -228,6 +233,7 @@ object V2RayServiceManager {
                     Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
                     stopSpeedNotification()
                 }
+
                 Intent.ACTION_SCREEN_ON -> {
                     Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
                     startSpeedNotification()
@@ -237,7 +243,7 @@ object V2RayServiceManager {
     }
 
     private fun measureV2rayDelay() {
-        GlobalScope.launch(Dispatchers.IO) {
+        CoroutineScope(Dispatchers.IO).launch {
             val service = serviceControl?.get()?.getService() ?: return@launch
             var time = -1L
             var errstr = ""
@@ -270,46 +276,52 @@ object V2RayServiceManager {
     private fun showNotification() {
         val service = serviceControl?.get()?.getService() ?: return
         val startMainIntent = Intent(service, MainActivity::class.java)
-        val contentPendingIntent = PendingIntent.getActivity(service,
+        val contentPendingIntent = PendingIntent.getActivity(
-                NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent,
+            service,
+            NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent,
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             } else {
                 PendingIntent.FLAG_UPDATE_CURRENT
-            })
+            }
+        )
 
         val stopV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
         stopV2RayIntent.`package` = ANG_PACKAGE
         stopV2RayIntent.putExtra("key", AppConfig.MSG_STATE_STOP)
 
-        val stopV2RayPendingIntent = PendingIntent.getBroadcast(service,
+        val stopV2RayPendingIntent = PendingIntent.getBroadcast(
-                NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent,
+            service,
+            NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent,
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
             } else {
                 PendingIntent.FLAG_UPDATE_CURRENT
-            })
+            }
+        )
 
         val channelId =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    createNotificationChannel()
+                createNotificationChannel()
-                } else {
+            } else {
-                    // If earlier version channel ID is not used
+                // If earlier version channel ID is not used
-                    // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                    ""
+                ""
-                }
+            }
 
         mBuilder = NotificationCompat.Builder(service, channelId)
-                .setSmallIcon(R.drawable.ic_stat_name)
+            .setSmallIcon(R.drawable.ic_stat_name)
-                .setContentTitle(currentConfig?.remarks)
+            .setContentTitle(currentConfig?.remarks)
-                .setPriority(NotificationCompat.PRIORITY_MIN)
+            .setPriority(NotificationCompat.PRIORITY_MIN)
-                .setOngoing(true)
+            .setOngoing(true)
-                .setShowWhen(false)
+            .setShowWhen(false)
-                .setOnlyAlertOnce(true)
+            .setOnlyAlertOnce(true)
-                .setContentIntent(contentPendingIntent)
+            .setContentIntent(contentPendingIntent)
-                .addAction(R.drawable.ic_delete_24dp,
+            .addAction(
-                        service.getString(R.string.notification_action_stop_v2ray),
+                R.drawable.ic_delete_24dp,
-                        stopV2RayPendingIntent)
+                service.getString(R.string.notification_action_stop_v2ray),
+                stopV2RayPendingIntent
+            )
         //.build()
 
         //mBuilder?.setDefaults(NotificationCompat.FLAG_ONLY_ALERT_ONCE)  //取消震动,铃声其他都不好使
@@ -319,10 +331,12 @@ object V2RayServiceManager {
 
     @RequiresApi(Build.VERSION_CODES.O)
     private fun createNotificationChannel(): String {
-        val channelId = "RAY_NG_M_CH_ID"
+        val channelId = AppConfig.RAY_NG_CHANNEL_ID
-        val channelName = "V2rayNG Background Service"
+        val channelName = AppConfig.RAY_NG_CHANNEL_NAME
-        val chan = NotificationChannel(channelId,
+        val chan = NotificationChannel(
-                channelName, NotificationManager.IMPORTANCE_HIGH)
+            channelId,
+            channelName, NotificationManager.IMPORTANCE_HIGH
+        )
         chan.lightColor = Color.DKGRAY
         chan.importance = NotificationManager.IMPORTANCE_NONE
         chan.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
@@ -334,8 +348,8 @@ object V2RayServiceManager {
         val service = serviceControl?.get()?.getService() ?: return
         service.stopForeground(true)
         mBuilder = null
-        mSubscription?.unsubscribe()
+        mDisposable?.dispose()
-        mSubscription = null
+        mDisposable = null
     }
 
     private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) {
@@ -362,41 +376,44 @@ object V2RayServiceManager {
     }
 
     private fun startSpeedNotification() {
-        if (mSubscription == null &&
+        if (mDisposable == null &&
-                v2rayPoint.isRunning &&
+            v2rayPoint.isRunning &&
-                settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) == true) {
+            settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) == true
+        ) {
             var lastZeroSpeed = false
             val outboundTags = currentConfig?.getAllOutboundTags()
             outboundTags?.remove(TAG_DIRECT)
 
-            mSubscription = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
+            mDisposable = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
-                    .subscribe {
+                .subscribe {
-                        val queryTime = System.currentTimeMillis()
+                    val queryTime = System.currentTimeMillis()
-                        val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                    val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
-                        var proxyTotal = 0L
+                    var proxyTotal = 0L
-                        val text = StringBuilder()
+                    val text = StringBuilder()
-                        outboundTags?.forEach {
+                    outboundTags?.forEach {
-                            val up = v2rayPoint.queryStats(it, "uplink")
+                        val up = v2rayPoint.queryStats(it, AppConfig.UPLINK)
-                            val down = v2rayPoint.queryStats(it, "downlink")
+                        val down = v2rayPoint.queryStats(it, AppConfig.DOWNLINK)
-                            if (up + down > 0) {
+                        if (up + down > 0) {
-                                appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
+                            appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
-                                proxyTotal += up + down
+                            proxyTotal += up + down
-                            }
                         }
-                        val directUplink = v2rayPoint.queryStats(TAG_DIRECT, "uplink")
-                        val directDownlink = v2rayPoint.queryStats(TAG_DIRECT, "downlink")
-                        val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
-                        if (!zeroSpeed || !lastZeroSpeed) {
-                            if (proxyTotal == 0L) {
-                                appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
-                            }
-                            appendSpeedString(text, TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
-                                    directDownlink / sinceLastQueryInSeconds)
-                            updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
-                        }
-                        lastZeroSpeed = zeroSpeed
-                        lastQueryTime = queryTime
                     }
+                    val directUplink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.UPLINK)
+                    val directDownlink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.DOWNLINK)
+                    val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
+                    if (!zeroSpeed || !lastZeroSpeed) {
+                        if (proxyTotal == 0L) {
+                            appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
+                        }
+                        appendSpeedString(
+                            text, TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
+                            directDownlink / sinceLastQueryInSeconds
+                        )
+                        updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
+                    }
+                    lastZeroSpeed = zeroSpeed
+                    lastQueryTime = queryTime
+                }
         }
     }
 
@@ -411,9 +428,9 @@ object V2RayServiceManager {
     }
 
     private fun stopSpeedNotification() {
-        if (mSubscription != null) {
+        if (mDisposable != null) {
-            mSubscription?.unsubscribe() //stop queryStats
+            mDisposable?.dispose() //stop queryStats
-            mSubscription = null
+            mDisposable = null
             updateNotification(currentConfig?.remarks, 0, 0)
         }
     }

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

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

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

@@ -4,21 +4,28 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.*
+import android.net.ConnectivityManager
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.VpnService
 import android.os.Build
 import android.os.ParcelFileDescriptor
 import android.os.StrictMode
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.ERoutingMode
+import com.v2ray.ang.util.MmkvManager.settingsStorage
-import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.MyContextWrapper
+import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.io.File
 import java.lang.ref.SoftReference
@@ -33,7 +40,6 @@ class V2RayVpnService : VpnService(), ServiceControl {
         private const val TUN2SOCKS = "libtun2socks.so"
     }
 
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     private lateinit var mInterface: ParcelFileDescriptor
     private var isRunning = false
@@ -53,9 +59,9 @@ class V2RayVpnService : VpnService(), ServiceControl {
     @delegate:RequiresApi(Build.VERSION_CODES.P)
     private val defaultNetworkRequest by lazy {
         NetworkRequest.Builder()
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
-                .build()
+            .build()
     }
 
     private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
@@ -111,13 +117,11 @@ class V2RayVpnService : VpnService(), ServiceControl {
         val builder = Builder()
         //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
 
-        val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE)
-            ?: ERoutingMode.BYPASS_LAN_MAINLAND.value
-
         builder.setMtu(VPN_MTU)
         builder.addAddress(PRIVATE_VLAN4_CLIENT, 30)
         //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        if (routingMode == ERoutingMode.BYPASS_LAN.value || routingMode == ERoutingMode.BYPASS_LAN_MAINLAND.value) {
+        val bypassLan = SettingsManager.routingRulesetsBypassLan()
+        if (bypassLan) {
             resources.getStringArray(R.array.bypass_private_ip_address).forEach {
                 val addr = it.split('/')
                 builder.addRoute(addr[0], addr[1].toInt())
@@ -128,29 +132,32 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
         if (settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) == true) {
             builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
-            if (routingMode == ERoutingMode.BYPASS_LAN.value || routingMode == ERoutingMode.BYPASS_LAN_MAINLAND.value) {
+            if (bypassLan) {
                 builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
             } else {
                 builder.addRoute("::", 0)
             }
         }
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+//        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        } else {
+//        } else {
-            Utils.getVpnDnsServers()
+        Utils.getVpnDnsServers()
-                    .forEach {
+            .forEach {
-                        if (Utils.isPureIpAddress(it)) {
+                if (Utils.isPureIpAddress(it)) {
-                            builder.addDnsServer(it)
+                    builder.addDnsServer(it)
-                        }
+                }
-                    }
+            }
-        }
+//        }
 
         builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
 
+        val selfPackageName = BuildConfig.APPLICATION_ID
         if (settingsStorage?.decodeBool(AppConfig.PREF_PER_APP_PROXY) == true) {
             val apps = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
             val bypassApps = settingsStorage?.decodeBool(AppConfig.PREF_BYPASS_APPS) ?: false
+            //process self package
+            if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
             apps?.forEach {
                 try {
                     if (bypassApps)
@@ -158,9 +165,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
                     else
                         builder.addAllowedApplication(it)
                 } catch (e: PackageManager.NameNotFoundException) {
-                    //Logger.d(e)
                 }
             }
+        } else {
+            builder.addDisallowedApplication(selfPackageName)
         }
 
         // Close the old interface since the parameters have been changed.
@@ -195,15 +203,17 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     private fun runTun2socks() {
-        val socksPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+        val socksPort = SettingsManager.getSocksPort()
-        val cmd = arrayListOf(File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
+        val cmd = arrayListOf(
-                "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,
+            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-                "--netif-netmask", "255.255.255.252",
+            "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,
-                "--socks-server-addr", "127.0.0.1:${socksPort}",
+            "--netif-netmask", "255.255.255.252",
-                "--tunmtu", VPN_MTU.toString(),
+            "--socks-server-addr", "$LOOPBACK:${socksPort}",
-                "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
+            "--tunmtu", VPN_MTU.toString(),
-                "--enable-udprelay",
+            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
-                "--loglevel", "notice")
+            "--enable-udprelay",
+            "--loglevel", "notice"
+        )
 
         if (settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) == true) {
             cmd.add("--netif-ip6addr")
@@ -212,7 +222,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
         if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
             val localDnsPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
             cmd.add("--dnsgw")
-            cmd.add("127.0.0.1:${localDnsPort}")
+            cmd.add("$LOOPBACK:${localDnsPort}")
         }
         Log.d(packageName, cmd.toString())
 
@@ -220,14 +230,14 @@ class V2RayVpnService : VpnService(), ServiceControl {
             val proBuilder = ProcessBuilder(cmd)
             proBuilder.redirectErrorStream(true)
             process = proBuilder
-                    .directory(applicationContext.filesDir)
+                .directory(applicationContext.filesDir)
-                    .start()
+                .start()
             Thread(Runnable {
-                Log.d(packageName,"$TUN2SOCKS check")
+                Log.d(packageName, "$TUN2SOCKS check")
                 process.waitFor()
-                Log.d(packageName,"$TUN2SOCKS exited")
+                Log.d(packageName, "$TUN2SOCKS exited")
                 if (isRunning) {
-                    Log.d(packageName,"$TUN2SOCKS restart")
+                    Log.d(packageName, "$TUN2SOCKS restart")
                     runTun2socks()
                 }
             }).start()
@@ -244,7 +254,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
         val path = File(applicationContext.filesDir, "sock_path").absolutePath
         Log.d(packageName, path)
 
-        GlobalScope.launch(Dispatchers.IO) {
+        CoroutineScope(Dispatchers.IO).launch {
             var tries = 0
             while (true) try {
                 Thread.sleep(50L shl tries)
@@ -274,7 +284,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
 //        saveVpnNetworkInfo(configName, info)
-        isRunning = false;
+        isRunning = false
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             try {
                 connectivity.unregisterNetworkCallback(defaultNetworkCallback)
@@ -327,7 +337,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
-            MyContextWrapper.wrap(newBase,  Utils.getLocale(newBase))
+            MyContextWrapper.wrap(newBase, Utils.getLocale())
         }
         super.attachBaseContext(context)
     }

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

@@ -6,7 +6,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.FileProvider
-import com.tbruyelle.rxpermissions.RxPermissions
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.BuildConfig
@@ -21,14 +21,12 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 
 class AboutActivity : BaseActivity() {
-    private lateinit var binding: ActivityAboutBinding
+    private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
     private val extDir by lazy { File(Utils.backupPath(this)) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityAboutBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         title = getString(R.string.title_about)
 

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

@@ -23,16 +23,19 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         android.R.id.home -> {
-            onBackPressed()
+            // Handles the home button press by delegating to the onBackPressedDispatcher.
+            // This ensures consistent back navigation behavior.
+            onBackPressedDispatcher.onBackPressed()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
-            MyContextWrapper.wrap(newBase,  Utils.getLocale(newBase))
+            MyContextWrapper.wrap(newBase, Utils.getLocale())
         }
         super.attachBaseContext(context)
     }

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

@@ -5,7 +5,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 
 class FragmentAdapter(fragmentActivity: FragmentActivity, private val mFragments: List<Fragment>) :
-        FragmentStateAdapter(fragmentActivity) {
+    FragmentStateAdapter(fragmentActivity) {
 
     override fun createFragment(position: Int): Fragment {
         return mFragments[position]

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

@@ -1,8 +1,8 @@
 package com.v2ray.ang.ui
 
+import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.view.Menu
 import android.view.MenuItem
@@ -14,20 +14,18 @@ import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-
+import kotlinx.coroutines.withContext
 import java.io.IOException
-import java.util.LinkedHashSet
 
 class LogcatActivity : BaseActivity() {
-    private lateinit var binding: ActivityLogcatBinding
+    private val binding by lazy {
+        ActivityLogcatBinding.inflate(layoutInflater)
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityLogcatBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         title = getString(R.string.title_logcat)
 
@@ -44,8 +42,10 @@ class LogcatActivity : BaseActivity() {
                     val lst = LinkedHashSet<String>()
                     lst.add("logcat")
                     lst.add("-c")
-                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                    withContext(Dispatchers.IO) {
-                    process.waitFor()
+                        val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                        process.waitFor()
+                    }
                 }
                 val lst = LinkedHashSet<String>()
                 lst.add("logcat")
@@ -54,7 +54,9 @@ class LogcatActivity : BaseActivity() {
                 lst.add("time")
                 lst.add("-s")
                 lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err")
-                val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                val process = withContext(Dispatchers.IO) {
+                    Runtime.getRuntime().exec(lst.toTypedArray())
+                }
 //                val bufferedReader = BufferedReader(
 //                        InputStreamReader(process.inputStream))
 //                val allText = bufferedReader.use(BufferedReader::readText)
@@ -82,10 +84,12 @@ class LogcatActivity : BaseActivity() {
             toast(R.string.toast_success)
             true
         }
+
         R.id.clear_all -> {
             logcat(true)
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 }

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

@@ -18,60 +18,78 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.navigation.NavigationView
-import com.tbruyelle.rxpermissions.RxPermissions
+import com.google.android.material.tabs.TabLayout
-import com.tencent.mmkv.MMKV
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityMainBinding
-import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import me.drakeet.support.toast.ToastCompat
-import rx.Observable
-import rx.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
-    private lateinit var binding: ActivityMainBinding
+    private val binding by lazy {
+        ActivityMainBinding.inflate(layoutInflater)
+    }
 
     private val adapter by lazy { MainRecyclerAdapter(this) }
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
     private val requestVpnPermission = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
             startV2Ray()
         }
     }
+    private val requestSubSettingActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        initGroupTab()
+    }
+    private val tabGroupListener = object : TabLayout.OnTabSelectedListener {
+        override fun onTabSelected(tab: TabLayout.Tab?) {
+            val selectId = tab?.tag.toString()
+            if (selectId != mainViewModel.subscriptionId) {
+                mainViewModel.subscriptionIdChanged(selectId)
+            }
+        }
+
+        override fun onTabUnselected(tab: TabLayout.Tab?) {
+        }
+
+        override fun onTabReselected(tab: TabLayout.Tab?) {
+        }
+    }
     private var mItemTouchHelper: ItemTouchHelper? = null
     val mainViewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
         title = getString(R.string.title_server)
         setSupportActionBar(binding.toolbar)
 
         binding.fab.setOnClickListener {
             if (mainViewModel.isRunning.value == true) {
                 Utils.stopVService(this)
-            } else if ((settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: "VPN") == "VPN") {
+            } else if ((settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
                 val intent = VpnService.prepare(this)
                 if (intent == null) {
                     startV2Ray()
@@ -95,20 +113,18 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = adapter
 
-        val callback = SimpleItemTouchHelperCallback(adapter)
+        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
-        mItemTouchHelper = ItemTouchHelper(callback)
         mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
 
-
         val toggle = ActionBarDrawerToggle(
-                this, binding.drawerLayout, binding.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
+            this, binding.drawerLayout, binding.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close
+        )
         binding.drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
         binding.navView.setNavigationItemSelectedListener(this)
 
-
+        initGroupTab()
         setupViewModel()
-        mainViewModel.copyAssets(assets)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             RxPermissions(this)
@@ -155,10 +171,35 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             }
         }
         mainViewModel.startListenBroadcast()
+        mainViewModel.copyAssets(assets)
+    }
+
+    private fun initGroupTab() {
+        binding.tabGroup.removeOnTabSelectedListener(tabGroupListener)
+        binding.tabGroup.removeAllTabs()
+        binding.tabGroup.isVisible = false
+
+        val (listId, listRemarks) = mainViewModel.getSubscriptions(this)
+        if (listId == null || listRemarks == null) {
+            return
+        }
+
+        for (it in listRemarks.indices) {
+            val tab = binding.tabGroup.newTab()
+            tab.text = listRemarks[it]
+            tab.tag = listId[it]
+            binding.tabGroup.addTab(tab)
+        }
+        val selectIndex =
+            listId.indexOf(mainViewModel.subscriptionId).takeIf { it >= 0 } ?: (listId.count() - 1)
+        binding.tabGroup.selectTab(binding.tabGroup.getTabAt(selectIndex))
+        binding.tabGroup.addOnTabSelectedListener(tabGroupListener)
+        binding.tabGroup.isVisible = true
     }
 
     fun startV2Ray() {
-        if (mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) {
+        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+            toast(R.string.title_file_chooser)
             return
         }
         V2RayServiceManager.startV2Ray(this)
@@ -169,10 +210,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             Utils.stopVService(this)
         }
         Observable.timer(500, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
+            .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
+            .subscribe {
-                    startV2Ray()
+                startV2Ray()
-                }
+            }
     }
 
     public override fun onResume() {
@@ -186,7 +227,25 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_main, menu)
-        return true
+
+        val searchItem = menu.findItem(R.id.search_view)
+        if (searchItem != null) {
+            val searchView = searchItem.actionView as SearchView
+            searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean = false
+
+                override fun onQueryTextChange(newText: String?): Boolean {
+                    mainViewModel.filterConfig(newText.orEmpty())
+                    return false
+                }
+            })
+
+            searchView.setOnCloseListener {
+                mainViewModel.filterConfig("")
+                false
+            }
+        }
+        return super.onCreateOptionsMenu(menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
@@ -194,46 +253,67 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             importQRcode(true)
             true
         }
+
         R.id.import_clipboard -> {
             importClipboard()
             true
         }
+
         R.id.import_manually_vmess -> {
             importManually(EConfigType.VMESS.value)
             true
         }
+
         R.id.import_manually_vless -> {
             importManually(EConfigType.VLESS.value)
             true
         }
+
         R.id.import_manually_ss -> {
             importManually(EConfigType.SHADOWSOCKS.value)
             true
         }
+
         R.id.import_manually_socks -> {
             importManually(EConfigType.SOCKS.value)
             true
         }
+
+        R.id.import_manually_http -> {
+            importManually(EConfigType.HTTP.value)
+            true
+        }
+
         R.id.import_manually_trojan -> {
             importManually(EConfigType.TROJAN.value)
             true
         }
+
         R.id.import_manually_wireguard -> {
             importManually(EConfigType.WIREGUARD.value)
             true
         }
+
+        R.id.import_manually_hysteria2 -> {
+            importManually(EConfigType.HYSTERIA2.value)
+            true
+        }
+
         R.id.import_config_custom_clipboard -> {
             importConfigCustomClipboard()
             true
         }
+
         R.id.import_config_custom_local -> {
             importConfigCustomLocal()
             true
         }
+
         R.id.import_config_custom_url -> {
             importConfigCustomUrlClipboard()
             true
         }
+
         R.id.import_config_custom_url_scan -> {
             importQRcode(false)
             true
@@ -245,11 +325,18 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.export_all -> {
-            if (AngConfigManager.shareNonCustomConfigsToClipboard(this, mainViewModel.serverList) == 0) {
+            binding.pbWaiting.show()
-                toast(R.string.toast_success)
+            lifecycleScope.launch(Dispatchers.IO) {
-            } else {
+                val ret = mainViewModel.exportAllServer()
-                toast(R.string.toast_failure)
+                launch(Dispatchers.Main) {
+                    if (ret == 0)
+                        toast(R.string.toast_success)
+                    else
+                        toast(R.string.toast_failure)
+                    binding.pbWaiting.hide()
+                }
             }
+
             true
         }
 
@@ -269,55 +356,79 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.del_all_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        MmkvManager.removeAllServer()
-                        mainViewModel.reloadServerList()
-                    }
-                    .setNegativeButton(android.R.string.no) {_, _ ->
-                        //do noting
-                    }
-                    .show()
-            true
-        }
-        R.id.del_duplicate_config-> {
             AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    mainViewModel.removeDuplicateServer()
+                    binding.pbWaiting.show()
-                    mainViewModel.reloadServerList()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        mainViewModel.removeAllServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            binding.pbWaiting.hide()
+                        }
+                    }
                 }
-                .setNegativeButton(android.R.string.no) {_, _ ->
+                .setNegativeButton(android.R.string.no) { _, _ ->
                     //do noting
                 }
                 .show()
             true
         }
+
+        R.id.del_duplicate_config -> {
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    binding.pbWaiting.show()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val ret = mainViewModel.removeDuplicateServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            toast(getString(R.string.title_del_duplicate_config_count, ret))
+                            binding.pbWaiting.hide()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.no) { _, _ ->
+                    //do noting
+                }
+                .show()
+            true
+        }
+
         R.id.del_invalid_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+            AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    MmkvManager.removeInvalidServer()
+                    binding.pbWaiting.show()
-                    mainViewModel.reloadServerList()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        mainViewModel.removeInvalidServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            binding.pbWaiting.hide()
+                        }
+                    }
                 }
-                .setNegativeButton(android.R.string.no) {_, _ ->
+                .setNegativeButton(android.R.string.no) { _, _ ->
                     //do noting
                 }
                 .show()
             true
         }
+
         R.id.sort_by_test_results -> {
-            MmkvManager.sortByTestResults()
+            binding.pbWaiting.show()
-            mainViewModel.reloadServerList()
+            lifecycleScope.launch(Dispatchers.IO) {
-            true
+                mainViewModel.sortByTestResults()
-        }
+                launch(Dispatchers.Main) {
-        R.id.filter_config -> {
+                    mainViewModel.reloadServerList()
-            mainViewModel.filterConfig(this)
+                    binding.pbWaiting.hide()
+                }
+            }
             true
         }
 
         else -> super.onOptionsItemSelected(item)
     }
 
-    private fun importManually(createConfigType : Int) {
+    private fun importManually(createConfigType: Int) {
         startActivity(
             Intent()
                 .putExtra("createConfigType", createConfigType)
@@ -336,16 +447,16 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 //                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), requestCode)
 //        } catch (e: Exception) {
         RxPermissions(this)
-                .request(Manifest.permission.CAMERA)
+            .request(Manifest.permission.CAMERA)
-                .subscribe {
+            .subscribe {
-                    if (it)
+                if (it)
-                        if (forConfig)
+                    if (forConfig)
-                            scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-                        else
-                            scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
                     else
-                        toast(R.string.toast_permission_denied)
+                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
-                }
+                else
+                    toast(R.string.toast_permission_denied)
+            }
 //        }
         return true
     }
@@ -378,22 +489,26 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importBatchConfig(server: String?) {
-        val dialog = AlertDialog.Builder(this)
+//        val dialog = AlertDialog.Builder(this)
-            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-            .setCancelable(false)
+//            .setCancelable(false)
-            .show()
+//            .show()
+        binding.pbWaiting.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val count = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
+            val (count, countSub) = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
             delay(500L)
             launch(Dispatchers.Main) {
                 if (count > 0) {
                     toast(R.string.toast_success)
                     mainViewModel.reloadServerList()
+                } else if (countSub > 0) {
+                    initGroupTab()
                 } else {
                     toast(R.string.toast_failure)
                 }
-                dialog.dismiss()
+                //dialog.dismiss()
+                binding.pbWaiting.hide()
             }
         }
     }
@@ -472,14 +587,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     /**
      * import config from sub
      */
-    private fun importConfigViaSub() : Boolean {
+    private fun importConfigViaSub(): Boolean {
-        val dialog = AlertDialog.Builder(this)
+//        val dialog = AlertDialog.Builder(this)
-            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-            .setCancelable(false)
+//            .setCancelable(false)
-            .show()
+//            .show()
+        binding.pbWaiting.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val count = AngConfigManager.updateConfigViaSubAll()
+            val count = mainViewModel.updateConfigViaSubAll()
             delay(500L)
             launch(Dispatchers.Main) {
                 if (count > 0) {
@@ -488,7 +604,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 } else {
                     toast(R.string.toast_failure)
                 }
-                dialog.dismiss()
+                //dialog.dismiss()
+                binding.pbWaiting.hide()
             }
         }
         return true
@@ -526,19 +643,19 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             Manifest.permission.READ_EXTERNAL_STORAGE
         }
         RxPermissions(this)
-                .request(permission)
+            .request(permission)
-                .subscribe {
+            .subscribe {
-                    if (it) {
+                if (it) {
-                        try {
+                    try {
-                            contentResolver.openInputStream(uri).use { input ->
+                        contentResolver.openInputStream(uri).use { input ->
-                                importCustomizeConfig(input?.bufferedReader()?.readText())
+                            importCustomizeConfig(input?.bufferedReader()?.readText())
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
                         }
-                    } else
+                    } catch (e: Exception) {
-                        toast(R.string.toast_permission_denied)
+                        e.printStackTrace()
-                }
+                    }
+                } else
+                    toast(R.string.toast_permission_denied)
+            }
     }
 
     /**
@@ -585,27 +702,35 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         return super.onKeyDown(keyCode, event)
     }
 
+
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         // Handle navigation view item clicks here.
         when (item.itemId) {
-            //R.id.server_profile -> activityClass = MainActivity::class.java
             R.id.sub_setting -> {
-                startActivity(Intent(this, SubSettingActivity::class.java))
+                requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
             }
+
             R.id.settings -> {
-                startActivity(Intent(this, SettingsActivity::class.java)
+                startActivity(
-                        .putExtra("isRunning", mainViewModel.isRunning.value == true))
+                    Intent(this, SettingsActivity::class.java)
+                        .putExtra("isRunning", mainViewModel.isRunning.value == true)
+                )
             }
-            R.id.user_asset_setting -> {
+
-                startActivity(Intent(this, UserAssetActivity::class.java))
+            R.id.routing_setting -> {
+                requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
             }
+
+
             R.id.promotion -> {
                 Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
             }
+
             R.id.logcat -> {
                 startActivity(Intent(this, LogcatActivity::class.java))
             }
-            R.id.about-> {
+
+            R.id.about -> {
                 startActivity(Intent(this, AboutActivity::class.java))
             }
         }

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

@@ -9,8 +9,6 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.google.gson.Gson
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AngApplication.Companion.application
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
@@ -18,29 +16,25 @@ import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerFooterBinding
 import com.v2ray.ang.databinding.ItemRecyclerMainBinding
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
-import rx.Observable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import rx.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
 import java.util.concurrent.TimeUnit
 
-class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>()
+class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
-        , ItemTouchHelperAdapter {
     companion object {
         private const val VIEW_TYPE_ITEM = 1
         private const val VIEW_TYPE_FOOTER = 2
     }
 
     private var mActivity: MainActivity = activity
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val subStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SUB, MMKV.MULTI_PROCESS_MODE) }
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
     private val share_method: Array<out String> by lazy {
         mActivity.resources.getStringArray(R.array.share_method)
     }
@@ -51,7 +45,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         if (holder is MainViewHolder) {
             val guid = mActivity.mainViewModel.serversCache[position].guid
-            val config = mActivity.mainViewModel.serversCache[position].config
+            val profile = mActivity.mainViewModel.serversCache[position].profile
 //            //filter
 //            if (mActivity.mainViewModel.subscriptionId.isNotEmpty()
 //                && mActivity.mainViewModel.subscriptionId != config.subscriptionId
@@ -61,48 +55,44 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
 //                holder.itemMainBinding.cardView.visibility = View.VISIBLE
 //            }
 
-            val outbound = config.getProxyOutbound()
             val aff = MmkvManager.decodeServerAffiliationInfo(guid)
 
-            holder.itemMainBinding.tvName.text = config.remarks
+            holder.itemMainBinding.tvName.text = profile.remarks
             holder.itemView.setBackgroundColor(Color.TRANSPARENT)
-            holder.itemMainBinding.tvTestResult.text = aff?.getTestDelayString() ?: ""
+            holder.itemMainBinding.tvTestResult.text = aff?.getTestDelayString().orEmpty()
             if ((aff?.testDelayMillis ?: 0L) < 0L) {
                 holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPingRed))
             } else {
                 holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPing))
             }
-            if (guid == mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
+            if (guid == MmkvManager.getSelectServer()) {
                 holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorAccent)
             } else {
                 holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
             }
-            holder.itemMainBinding.tvSubscription.text = ""
+            holder.itemMainBinding.tvSubscription.text = MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks ?: ""
-            val json = subStorage?.decodeString(config.subscriptionId)
-            if (!json.isNullOrBlank()) {
-                val sub = Gson().fromJson(json, SubscriptionItem::class.java)
-                holder.itemMainBinding.tvSubscription.text = sub.remarks
-            }
 
             var shareOptions = share_method.asList()
-            when (config.configType) {
+            when (profile.configType) {
                 EConfigType.CUSTOM -> {
                     holder.itemMainBinding.tvType.text = mActivity.getString(R.string.server_customize_config)
                     shareOptions = shareOptions.takeLast(1)
                 }
-                EConfigType.VLESS -> {
+
-                    holder.itemMainBinding.tvType.text = config.configType.name
-                }
                 else -> {
-                    holder.itemMainBinding.tvType.text = config.configType.name.lowercase()
+                    holder.itemMainBinding.tvType.text = profile.configType.name
                 }
             }
 
-            val strState = try{
+            // 隐藏主页服务器地址为xxx:xxx:***/xxx.xxx.xxx.***
-                "${outbound?.getServerAddress()?.dropLast(3)}*** : ${outbound?.getServerPort()}"
+            val strState = "${
-            }catch(e: Exception){
+                profile.server?.let {
-                ""
+                    if (it.contains(":"))
-            }
+                        it.split(":").take(2).joinToString(":", postfix = ":***")
+                    else
+                        it.split('.').dropLast(1).joinToString(".", postfix = ".***")
+                }
+            } : ${profile.serverPort}"
 
             holder.itemMainBinding.tvStatistics.text = strState
 
@@ -111,7 +101,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                     try {
                         when (i) {
                             0 -> {
-                                if (config.configType == EConfigType.CUSTOM) {
+                                if (profile.configType == EConfigType.CUSTOM) {
                                     shareFullContent(guid)
                                 } else {
                                     val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(mActivity))
@@ -119,6 +109,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                                     AlertDialog.Builder(mActivity).setView(ivBinding.root).show()
                                 }
                             }
+
                             1 -> {
                                 if (AngConfigManager.share2Clipboard(mActivity, guid) == 0) {
                                     mActivity.toast(R.string.toast_success)
@@ -126,6 +117,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                                     mActivity.toast(R.string.toast_failure)
                                 }
                             }
+
                             2 -> shareFullContent(guid)
                             else -> mActivity.toast("else")
                         }
@@ -137,21 +129,21 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
 
             holder.itemMainBinding.layoutEdit.setOnClickListener {
                 val intent = Intent().putExtra("guid", guid)
-                        .putExtra("isRunning", isRunning)
+                    .putExtra("isRunning", isRunning)
-                if (config.configType == EConfigType.CUSTOM) {
+                if (profile.configType == EConfigType.CUSTOM) {
                     mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
                 } else {
                     mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java))
                 }
             }
             holder.itemMainBinding.layoutRemove.setOnClickListener {
-                if (guid != mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
+                if (guid != MmkvManager.getSelectServer()) {
                     if (settingsStorage?.decodeBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
                         AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
                             .setPositiveButton(android.R.string.ok) { _, _ ->
                                 removeServer(guid, position)
                             }
-                            .setNegativeButton(android.R.string.no) {_, _ ->
+                            .setNegativeButton(android.R.string.no) { _, _ ->
                                 //do noting
                             }
                             .show()
@@ -164,20 +156,20 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             }
 
             holder.itemMainBinding.infoContainer.setOnClickListener {
-                val selected = mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)
+                val selected = MmkvManager.getSelectServer()
                 if (guid != selected) {
-                    mainStorage?.encode(MmkvManager.KEY_SELECTED_SERVER, guid)
+                    MmkvManager.setSelectServer(guid)
                     if (!TextUtils.isEmpty(selected)) {
-                        notifyItemChanged(mActivity.mainViewModel.getPosition(selected?:""))
+                        notifyItemChanged(mActivity.mainViewModel.getPosition(selected.orEmpty()))
                     }
                     notifyItemChanged(mActivity.mainViewModel.getPosition(guid))
                     if (isRunning) {
                         Utils.stopVService(mActivity)
                         Observable.timer(500, TimeUnit.MILLISECONDS)
-                                .observeOn(AndroidSchedulers.mainThread())
+                            .observeOn(AndroidSchedulers.mainThread())
-                                .subscribe {
+                            .subscribe {
-                                    V2RayServiceManager.startV2Ray(mActivity)
+                                V2RayServiceManager.startV2Ray(mActivity)
-                                }
+                            }
                     }
                 }
             }
@@ -202,7 +194,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
         }
     }
 
-    private  fun removeServer(guid: String,position:Int) {
+    private fun removeServer(guid: String, position: Int) {
         mActivity.mainViewModel.removeServer(guid)
         notifyItemRemoved(position)
         notifyItemRangeChanged(position, mActivity.mainViewModel.serversCache.size)
@@ -212,6 +204,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
         return when (viewType) {
             VIEW_TYPE_ITEM ->
                 MainViewHolder(ItemRecyclerMainBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+
             else ->
                 FooterViewHolder(ItemRecyclerFooterBinding.inflate(LayoutInflater.from(parent.context), parent, false))
         }
@@ -236,36 +229,21 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     }
 
     class MainViewHolder(val itemMainBinding: ItemRecyclerMainBinding) :
-            BaseViewHolder(itemMainBinding.root), ItemTouchHelperViewHolder
+        BaseViewHolder(itemMainBinding.root), ItemTouchHelperViewHolder
 
     class FooterViewHolder(val itemFooterBinding: ItemRecyclerFooterBinding) :
-            BaseViewHolder(itemFooterBinding.root)
+        BaseViewHolder(itemFooterBinding.root)
-
-    override fun onItemDismiss(position: Int) {
-        val guid = mActivity.mainViewModel.serversCache.getOrNull(position)?.guid ?: return
-        if (guid != mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)) {
-//            mActivity.alert(R.string.del_config_comfirm) {
-//                positiveButton(android.R.string.ok) {
-            mActivity.mainViewModel.removeServer(guid)
-            notifyItemRemoved(position)
-//                }
-//                show()
-//            }
-        }
-    }
 
     override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
         mActivity.mainViewModel.swapServer(fromPosition, toPosition)
         notifyItemMoved(fromPosition, toPosition)
-        // position is changed, since position is used by click callbacks, need to update range
-        if (toPosition > fromPosition)
-            notifyItemRangeChanged(fromPosition, toPosition - fromPosition + 1)
-        else
-            notifyItemRangeChanged(toPosition, fromPosition - toPosition + 1)
         return true
     }
 
     override fun onItemMoveCompleted() {
         // do nothing
     }
+
+    override fun onItemDismiss(position: Int) {
+    }
 }

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

@@ -10,7 +10,6 @@ import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
@@ -19,26 +18,25 @@ import com.v2ray.ang.dto.AppInfo
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.util.AppManagerUtil
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
 import java.text.Collator
 
 class PerAppProxyActivity : BaseActivity() {
-    private lateinit var binding: ActivityBypassListBinding
+    private val binding by lazy {
+        ActivityBypassListBinding.inflate(layoutInflater)
+    }
 
     private var adapter: PerAppProxyAdapter? = null
     private var appsAll: List<AppInfo>? = null
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityBypassListBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
         binding.recyclerView.addItemDecoration(dividerItemDecoration)
@@ -46,32 +44,32 @@ class PerAppProxyActivity : BaseActivity() {
         val blacklist = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
 
         AppManagerUtil.rxLoadNetworkAppList(this)
-                .subscribeOn(Schedulers.io())
+            .subscribeOn(Schedulers.io())
-                .map {
+            .map {
-                    if (blacklist != null) {
+                if (blacklist != null) {
-                        it.forEach { one ->
+                    it.forEach { one ->
-                            if (blacklist.contains(one.packageName)) {
+                        if (blacklist.contains(one.packageName)) {
-                                one.isSelected = 1
+                            one.isSelected = 1
-                            } else {
+                        } else {
-                                one.isSelected = 0
+                            one.isSelected = 0
-                            }
                         }
-                        val comparator = Comparator<AppInfo> { p1, p2 ->
-                            when {
-                                p1.isSelected > p2.isSelected -> -1
-                                p1.isSelected == p2.isSelected -> 0
-                                else -> 1
-                            }
-                        }
-                        it.sortedWith(comparator)
-                    } else {
-                        val comparator = object : Comparator<AppInfo> {
-                            val collator = Collator.getInstance()
-                            override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
-                        }
-                        it.sortedWith(comparator)
                     }
+                    val comparator = Comparator<AppInfo> { p1, p2 ->
+                        when {
+                            p1.isSelected > p2.isSelected -> -1
+                            p1.isSelected == p2.isSelected -> 0
+                            else -> 1
+                        }
+                    }
+                    it.sortedWith(comparator)
+                } else {
+                    val comparator = object : Comparator<AppInfo> {
+                        val collator = Collator.getInstance()
+                        override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
+                    }
+                    it.sortedWith(comparator)
                 }
+            }
 //                .map {
 //                    val comparator = object : Comparator<AppInfo> {
 //                        val collator = Collator.getInstance()
@@ -79,13 +77,13 @@ class PerAppProxyActivity : BaseActivity() {
 //                    }
 //                    it.sortedWith(comparator)
 //                }
-                .observeOn(AndroidSchedulers.mainThread())
+            .observeOn(AndroidSchedulers.mainThread())
-                .subscribe {
+            .subscribe {
-                    appsAll = it
+                appsAll = it
-                    adapter = PerAppProxyAdapter(this, it, blacklist)
+                adapter = PerAppProxyAdapter(this, it, blacklist)
-                    binding.recyclerView.adapter = adapter
+                binding.recyclerView.adapter = adapter
-                    binding.pbWaiting.visibility = View.GONE
+                binding.pbWaiting.visibility = View.GONE
-                }
+            }
         /***
         recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
         var dst = 0
@@ -188,12 +186,10 @@ class PerAppProxyActivity : BaseActivity() {
         if (searchItem != null) {
             val searchView = searchItem.actionView as SearchView
             searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String?): Boolean {
+                override fun onQueryTextSubmit(query: String?): Boolean = false
-                    return false
-                }
 
                 override fun onQueryTextChange(newText: String?): Boolean {
-                    filterProxyApp(newText?:"")
+                    filterProxyApp(newText.orEmpty())
                     return false
                 }
             })
@@ -220,18 +216,22 @@ class PerAppProxyActivity : BaseActivity() {
             it.notifyDataSetChanged()
             true
         } ?: false
+
         R.id.select_proxy_app -> {
             selectProxyApp()
             true
         }
+
         R.id.import_proxy_app -> {
             importProxyApp()
             true
         }
+
         R.id.export_proxy_app -> {
             exportProxyApp()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 
@@ -250,9 +250,7 @@ class PerAppProxyActivity : BaseActivity() {
 
     private fun importProxyApp() {
         val content = Utils.getClipboard(applicationContext)
-        if (TextUtils.isEmpty(content)) {
+        if (TextUtils.isEmpty(content)) return
-            return
-        }
         selectProxyApp(content, false)
         toast(R.string.toast_success)
     }
@@ -274,9 +272,7 @@ class PerAppProxyActivity : BaseActivity() {
             } else {
                 content
             }
-            if (TextUtils.isEmpty(proxyApps)) {
+            if (TextUtils.isEmpty(proxyApps)) return false
-                return false
-            }
 
             adapter?.blacklist?.clear()
 
@@ -316,12 +312,8 @@ class PerAppProxyActivity : BaseActivity() {
 
     private fun inProxyApps(proxyApps: String, packageName: String, force: Boolean): Boolean {
         if (force) {
-            if (packageName == "com.google.android.webview") {
+            if (packageName == "com.google.android.webview") return false
-                return false
+            if (packageName.startsWith("com.google")) return true
-            }
-            if (packageName.startsWith("com.google")) {
-                return true
-            }
         }
 
         return proxyApps.indexOf(packageName) >= 0
@@ -334,7 +326,8 @@ class PerAppProxyActivity : BaseActivity() {
         if (key.isNotEmpty()) {
             appsAll?.forEach {
                 if (it.appName.uppercase().indexOf(key) >= 0
-                        || it.packageName.uppercase().indexOf(key) >= 0) {
+                    || it.packageName.uppercase().indexOf(key) >= 0
+                ) {
                     apps.add(it)
                 }
             }

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

@@ -1,16 +1,15 @@
 package com.v2ray.ang.ui
 
 import android.view.LayoutInflater
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemRecyclerBypassListBinding
 import com.v2ray.ang.dto.AppInfo
-import java.util.*
 
 class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, blacklist: MutableSet<String>?) :
-        RecyclerView.Adapter<PerAppProxyAdapter.BaseViewHolder>() {
+    RecyclerView.Adapter<PerAppProxyAdapter.BaseViewHolder>() {
 
     companion object {
         private const val VIEW_TYPE_HEADER = 0
@@ -34,8 +33,10 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
         return when (viewType) {
             VIEW_TYPE_HEADER -> {
                 val view = View(ctx)
-                view.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                view.layoutParams = ViewGroup.LayoutParams(
-                        ctx.resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 0)
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ctx.resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 0
+                )
                 BaseViewHolder(view)
             }
 //            VIEW_TYPE_ITEM -> AppViewHolder(ctx.layoutInflater
@@ -51,7 +52,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
     open class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
     inner class AppViewHolder(private val itemBypassBinding: ItemRecyclerBypassListBinding) : BaseViewHolder(itemBypassBinding.root),
-            View.OnClickListener {
+        View.OnClickListener {
         private val inBlacklist: Boolean get() = blacklist.contains(appInfo.packageName)
         private lateinit var appInfo: AppInfo
 

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

@@ -0,0 +1,126 @@
+package com.v2ray.ang.ui
+
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityRoutingEditBinding
+import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class RoutingEditActivity : BaseActivity() {
+    private val binding by lazy { ActivityRoutingEditBinding.inflate(layoutInflater) }
+    private val position by lazy { intent.getIntExtra("position", -1) }
+
+    private val outbound_tag: Array<out String> by lazy {
+        resources.getStringArray(R.array.outbound_tag)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+        title = getString(R.string.routing_settings_rule_title)
+
+        val rulesetItem = SettingsManager.getRoutingRuleset(position)
+        if (rulesetItem != null) {
+            bindingServer(rulesetItem)
+        } else {
+            clearServer()
+        }
+    }
+
+    private fun bindingServer(rulesetItem: RulesetItem): Boolean {
+        binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
+        binding.chkLocked.isChecked = rulesetItem.looked ?: false
+        binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString(","))
+        binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString(","))
+        binding.etPort.text = Utils.getEditable(rulesetItem.port)
+        binding.etProtocol.text = Utils.getEditable(rulesetItem.protocol?.joinToString(","))
+        binding.etNetwork.text = Utils.getEditable(rulesetItem.network)
+        val outbound = Utils.arrayFind(outbound_tag, rulesetItem.outboundTag)
+        binding.spOutboundTag.setSelection(outbound)
+
+        return true
+    }
+
+    private fun clearServer(): Boolean {
+        binding.etRemarks.text = null
+        binding.spOutboundTag.setSelection(0)
+        return true
+    }
+
+    private fun saveServer(): Boolean {
+        val rulesetItem = SettingsManager.getRoutingRuleset(position) ?: RulesetItem()
+
+        rulesetItem.remarks = binding.etRemarks.text.toString()
+        rulesetItem.looked = binding.chkLocked.isChecked
+        binding.etDomain.text.toString().let { rulesetItem.domain = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
+        binding.etIp.text.toString().let { rulesetItem.ip = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
+        binding.etProtocol.text.toString().let { rulesetItem.protocol = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
+        binding.etPort.text.toString().let { rulesetItem.port = it.ifEmpty { null } }
+        binding.etNetwork.text.toString().let { rulesetItem.network = it.ifEmpty { null } }
+        rulesetItem.outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
+
+        if (TextUtils.isEmpty(rulesetItem.remarks)) {
+            toast(R.string.sub_setting_remarks)
+            return false
+        }
+
+        SettingsManager.saveRoutingRuleset(position, rulesetItem)
+        toast(R.string.toast_success)
+        finish()
+        return true
+    }
+
+    private fun deleteServer(): Boolean {
+        if (position >= 0) {
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        SettingsManager.removeRoutingRuleset(position)
+                        launch(Dispatchers.Main) {
+                            finish()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.no) { _, _ ->
+                    // do nothing
+                }
+                .show()
+        }
+        return true
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.action_server, menu)
+        val del_config = menu.findItem(R.id.del_config)
+
+        if (position < 0) {
+            del_config?.isVisible = false
+        }
+
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.del_config -> {
+            deleteServer()
+            true
+        }
+
+        R.id.save_config -> {
+            saveServer()
+            true
+        }
+
+        else -> super.onOptionsItemSelected(item)
+    }
+
+}

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

@@ -0,0 +1,158 @@
+package com.v2ray.ang.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.AdapterView
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
+import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class RoutingSettingActivity : BaseActivity() {
+    private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
+
+    var rulesets: MutableList<RulesetItem> = mutableListOf()
+    private val adapter by lazy { RoutingSettingRecyclerAdapter(this) }
+    private var mItemTouchHelper: ItemTouchHelper? = null
+    private val routing_domain_strategy: Array<out String> by lazy {
+        resources.getStringArray(R.array.routing_domain_strategy)
+    }
+    private val preset_rulesets: Array<out String> by lazy {
+        resources.getStringArray(R.array.preset_rulesets)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+
+        title = getString(R.string.routing_settings_title)
+
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        binding.recyclerView.adapter = adapter
+
+        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
+        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
+
+        val found = Utils.arrayFind(routing_domain_strategy, settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "")
+        found.let { binding.spDomainStrategy.setSelection(if (it >= 0) it else 0) }
+        binding.spDomainStrategy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                settingsStorage.encode(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, routing_domain_strategy[position])
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        refreshData()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_routing_setting, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.add_rule -> {
+            startActivity(Intent(this, RoutingEditActivity::class.java))
+            true
+        }
+
+        R.id.user_asset_setting -> {
+            startActivity(Intent(this, UserAssetActivity::class.java))
+            true
+        }
+
+        R.id.import_rulesets -> {
+            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
+                        try {
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                SettingsManager.resetRoutingRulesets(this@RoutingSettingActivity, i)
+                                launch(Dispatchers.Main) {
+                                    refreshData()
+                                    toast(R.string.toast_success)
+                                }
+                            }
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+                    }.show()
+
+
+                }
+                .setNegativeButton(android.R.string.no) { _, _ ->
+                    //do noting
+                }
+                .show()
+            true
+        }
+
+        R.id.import_rulesets_from_clipboard -> {
+            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    try {
+                        val clipboard = Utils.getClipboard(this)
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            val ret = SettingsManager.resetRoutingRulesetsFromClipboard(clipboard)
+                            launch(Dispatchers.Main) {
+                                if (ret) {
+                                    refreshData()
+                                    toast(R.string.toast_success)
+                                } else {
+                                    toast(R.string.toast_failure)
+                                }
+                            }
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+                .setNegativeButton(android.R.string.no) { _, _ ->
+                    //do noting
+                }
+                .show()
+            true
+        }
+
+        R.id.export_rulesets_to_clipboard -> {
+            val rulesetList = MmkvManager.decodeRoutingRulesets()
+            if (rulesetList.isNullOrEmpty()) {
+                toast(R.string.toast_failure)
+            } else {
+                Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
+                toast(R.string.toast_success)
+            }
+            true
+        }
+
+        else -> super.onOptionsItemSelected(item)
+    }
+
+    fun refreshData() {
+        rulesets = MmkvManager.decodeRoutingRulesets() ?: mutableListOf()
+        adapter.notifyDataSetChanged()
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.v2ray.ang.ui
+
+import android.content.Intent
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.databinding.ItemRecyclerRoutingSettingBinding
+import com.v2ray.ang.helper.ItemTouchHelperAdapter
+import com.v2ray.ang.helper.ItemTouchHelperViewHolder
+import com.v2ray.ang.ui.MainRecyclerAdapter.BaseViewHolder
+import com.v2ray.ang.util.SettingsManager
+
+class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : RecyclerView.Adapter<RoutingSettingRecyclerAdapter.MainViewHolder>(),
+    ItemTouchHelperAdapter {
+
+    private var mActivity: RoutingSettingActivity = activity
+    override fun getItemCount() = mActivity.rulesets.size
+
+    override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
+        val ruleset = mActivity.rulesets[position]
+
+        holder.itemRoutingSettingBinding.remarks.text = ruleset.remarks
+        holder.itemRoutingSettingBinding.domainIp.text = (ruleset.domain ?: ruleset.ip ?: ruleset.port)?.toString()
+        holder.itemRoutingSettingBinding.outboundTag.text = ruleset.outboundTag
+        holder.itemRoutingSettingBinding.chkEnable.isChecked = ruleset.enabled
+        holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.looked ?: false
+        holder.itemView.setBackgroundColor(Color.TRANSPARENT)
+
+        holder.itemRoutingSettingBinding.layoutEdit.setOnClickListener {
+            mActivity.startActivity(
+                Intent(mActivity, RoutingEditActivity::class.java)
+                    .putExtra("position", position)
+            )
+        }
+
+        holder.itemRoutingSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
+            if( !it.isPressed) return@setOnCheckedChangeListener
+            ruleset.enabled = isChecked
+            SettingsManager.saveRoutingRuleset(position, ruleset)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
+        return MainViewHolder(
+            ItemRecyclerRoutingSettingBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    class MainViewHolder(val itemRoutingSettingBinding: ItemRecyclerRoutingSettingBinding) :
+        BaseViewHolder(itemRoutingSettingBinding.root), ItemTouchHelperViewHolder
+
+    open class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        fun onItemSelected() {
+            itemView.setBackgroundColor(Color.LTGRAY)
+        }
+
+        fun onItemClear() {
+            itemView.setBackgroundColor(0)
+        }
+    }
+
+    override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
+        SettingsManager.swapRoutingRuleset(fromPosition, toPosition)
+        notifyItemMoved(fromPosition, toPosition)
+        return true
+    }
+
+    override fun onItemMoveCompleted() {
+        mActivity.refreshData()
+    }
+
+    override fun onItemDismiss(position: Int) {
+    }
+}

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

@@ -1,37 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import com.v2ray.ang.R
-import androidx.fragment.app.Fragment
-import com.google.android.material.tabs.TabLayoutMediator
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.databinding.ActivityRoutingSettingsBinding
-
-class RoutingSettingsActivity : BaseActivity() {
-    private lateinit var binding: ActivityRoutingSettingsBinding
-
-    private val titles: Array<out String> by lazy {
-        resources.getStringArray(R.array.routing_tag)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityRoutingSettingsBinding.inflate(layoutInflater)
-        val view = binding.root
-        setContentView(view)
-
-        title = getString(R.string.title_pref_routing_custom)
-
-        val fragments = ArrayList<Fragment>()
-        fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_AGENT))
-        fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_DIRECT))
-        fragments.add(RoutingSettingsFragment().newInstance(AppConfig.PREF_V2RAY_ROUTING_BLOCKED))
-
-        val adapter = FragmentAdapter(this, fragments)
-        binding.viewpager.adapter = adapter
-        //tablayout.setTabTextColors(Color.BLACK, Color.RED)
-        TabLayoutMediator(binding.tablayout, binding.viewpager) { tab, position ->
-            tab.text = titles[position]
-        }.attach()
-    }
-}

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

@@ -1,159 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-import androidx.appcompat.app.AppCompatActivity.RESULT_OK
-import android.content.Intent
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.*
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
-import com.tbruyelle.rxpermissions.RxPermissions
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.FragmentRoutingSettingsBinding
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.v2RayApplication
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class RoutingSettingsFragment : Fragment() {
-    private lateinit var binding: FragmentRoutingSettingsBinding
-    companion object {
-        private const val routing_arg = "routing_arg"
-    }
-
-   private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        // Inflate the layout for this fragment
-        binding = FragmentRoutingSettingsBinding.inflate(layoutInflater)
-        return binding.root// inflater.inflate(R.layout.fragment_routing_settings, container, false)
-    }
-
-    fun newInstance(arg: String): Fragment {
-        val fragment = RoutingSettingsFragment()
-        val bundle = Bundle()
-        bundle.putString(routing_arg, arg)
-        fragment.arguments = bundle
-        return fragment
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val content = settingsStorage?.getString(requireArguments().getString(routing_arg), "")
-        binding.etRoutingContent.text = Utils.getEditable(content)
-
-        setHasOptionsMenu(true)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_routing, menu)
-        return super.onCreateOptionsMenu(menu, inflater)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.save_routing -> {
-            saveRouting()
-            true
-        }
-        R.id.del_routing -> {
-            binding.etRoutingContent.text = null
-            true
-        }
-        R.id.scan_replace -> {
-            scanQRcode(true)
-            true
-        }
-        R.id.scan_append -> {
-            scanQRcode(false)
-            true
-        }
-        R.id.default_rules -> {
-            setDefaultRules()
-            true
-        }
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    private fun saveRouting() {
-        val content = binding.etRoutingContent.text.toString()
-        settingsStorage?.encode(requireArguments().getString(routing_arg), content)
-        activity?.toast(R.string.toast_success)
-    }
-
-    fun scanQRcode(forReplace: Boolean): Boolean {
-//        try {
-//            startActivityForResult(Intent("com.google.zxing.client.android.SCAN")
-//                    .addCategory(Intent.CATEGORY_DEFAULT)
-//                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), requestCode)
-//        } catch (e: Exception) {
-        RxPermissions(requireActivity())
-                .request(Manifest.permission.CAMERA)
-                .subscribe {
-                    if (it)
-                        if (forReplace)
-                            scanQRCodeForReplace.launch(Intent(activity, ScannerActivity::class.java))
-                        else
-                            scanQRCodeForAppend.launch(Intent(activity, ScannerActivity::class.java))
-                    else
-                        activity?.toast(R.string.toast_permission_denied)
-                }
-//        }
-        return true
-    }
-
-    private val scanQRCodeForReplace = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            val content = it.data?.getStringExtra("SCAN_RESULT")
-            binding.etRoutingContent.text = Utils.getEditable(content)
-        }
-    }
-
-    private val scanQRCodeForAppend = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            val content = it.data?.getStringExtra("SCAN_RESULT")
-            binding.etRoutingContent.text = Utils.getEditable("${binding.etRoutingContent.text},$content")
-        }
-    }
-
-    fun setDefaultRules(): Boolean {
-        var url = AppConfig.v2rayCustomRoutingListUrl
-        var tag = ""
-        when (requireArguments().getString(routing_arg)) {
-            AppConfig.PREF_V2RAY_ROUTING_AGENT -> {
-                tag = AppConfig.TAG_PROXY
-            }
-            AppConfig.PREF_V2RAY_ROUTING_DIRECT -> {
-                tag = AppConfig.TAG_DIRECT
-            }
-            AppConfig.PREF_V2RAY_ROUTING_BLOCKED -> {
-                tag = AppConfig.TAG_BLOCKED
-            }
-        }
-        url += tag
-
-        activity?.toast(R.string.msg_downloading_content)
-        lifecycleScope.launch(Dispatchers.IO) {
-            val content = Utils.getUrlContext(url, 5000)
-            launch(Dispatchers.Main) {
-                val routingList = if (TextUtils.isEmpty(content)) {
-                    Utils.readTextFromAssets(activity?.v2RayApplication, "custom_routing_$tag")
-                } else {
-                    content
-                }
-                binding.etRoutingContent.text = Utils.getEditable(routingList)
-                saveRouting()
-                //toast(R.string.toast_success)
-            }
-        }
-        return true
-    }
-}

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

@@ -1,13 +1,13 @@
 package com.v2ray.ang.ui
 
 import android.Manifest
-import android.content.*
+import android.content.Intent
-import com.tbruyelle.rxpermissions.RxPermissions
-import com.v2ray.ang.R
-import com.v2ray.ang.util.AngConfigManager
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
+import com.tbruyelle.rxpermissions3.RxPermissions
+import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.AngConfigManager
 
 class ScScannerActivity : BaseActivity() {
 
@@ -19,21 +19,21 @@ class ScScannerActivity : BaseActivity() {
 
     fun importQRcode(): Boolean {
         RxPermissions(this)
-                .request(Manifest.permission.CAMERA)
+            .request(Manifest.permission.CAMERA)
-                .subscribe {
+            .subscribe {
-                    if (it)
+                if (it)
-                        scanQRCode.launch(Intent(this, ScannerActivity::class.java))
+                    scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-                    else
+                else
-                        toast(R.string.toast_permission_denied)
+                    toast(R.string.toast_permission_denied)
-                }
+            }
 
         return true
     }
 
     private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
-            val count = AngConfigManager.importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"), "", false)
+            val (count, countSub) = AngConfigManager.importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"), "", false)
-            if (count > 0) {
+            if (count + countSub > 0) {
                 toast(R.string.toast_success)
             } else {
                 toast(R.string.toast_failure)

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

@@ -1,9 +1,9 @@
 package com.v2ray.ang.ui
 
-import com.v2ray.ang.R
-import com.v2ray.ang.util.Utils
 import android.os.Bundle
+import com.v2ray.ang.R
 import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.util.Utils
 
 class ScSwitchActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -1,29 +1,26 @@
 package com.v2ray.ang.ui
 
 import android.Manifest
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.os.Build
+import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
-import com.tbruyelle.rxpermissions.RxPermissions
+import com.tbruyelle.rxpermissions3.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.MmkvManager.settingsStorage
 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(){
+class ScannerActivity : BaseActivity() {
 
     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)
@@ -33,7 +30,7 @@ class ScannerActivity : BaseActivity(){
         }
     }
 
-    private fun launchScan(){
+    private fun launchScan() {
         scanQrCode.launch(
             ScannerConfig.build {
                 setHapticSuccessFeedback(true) // enable (default) or disable haptic feedback when a barcode was detected
@@ -44,8 +41,8 @@ class ScannerActivity : BaseActivity(){
     }
 
     private fun handleResult(result: QRResult) {
-        if (result is QRResult.QRSuccess ) {
+        if (result is QRResult.QRSuccess) {
-            finished(result.content.rawValue?:"")
+            finished(result.content.rawValue.orEmpty())
         } else {
             finish()
         }
@@ -54,7 +51,7 @@ class ScannerActivity : BaseActivity(){
     private fun finished(text: String) {
         val intent = Intent()
         intent.putExtra("SCAN_RESULT", text)
-        setResult(AppCompatActivity.RESULT_OK, intent)
+        setResult(RESULT_OK, intent)
         finish()
     }
 
@@ -68,6 +65,7 @@ class ScannerActivity : BaseActivity(){
             launchScan()
             true
         }
+
         R.id.select_photo -> {
             val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 Manifest.permission.READ_MEDIA_IMAGES
@@ -88,6 +86,7 @@ class ScannerActivity : BaseActivity(){
                 }
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 
@@ -110,7 +109,7 @@ class ScannerActivity : BaseActivity(){
             try {
                 val bitmap = BitmapFactory.decodeStream(contentResolver.openInputStream(uri))
                 val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                finished(text?:"")
+                finished(text.orEmpty())
             } catch (e: Exception) {
                 e.printStackTrace()
                 toast(e.message.toString())

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

@@ -12,7 +12,6 @@ import android.widget.LinearLayout
 import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.PREF_ALLOW_INSECURE
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
@@ -27,25 +26,17 @@ import com.v2ray.ang.dto.V2rayConfig.Companion.TLS
 import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.ID_MAIN
+import com.v2ray.ang.util.MmkvManager.settingsStorage
-import com.v2ray.ang.util.MmkvManager.KEY_SELECTED_SERVER
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.util.Utils.getIpv6Address
 
 class ServerActivity : BaseActivity() {
 
-    private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
     private val editGuid by lazy { intent.getStringExtra("guid").orEmpty() }
     private val isRunning by lazy {
         intent.getBooleanExtra("isRunning", false)
                 && editGuid.isNotEmpty()
-                && editGuid == mainStorage?.decodeString(KEY_SELECTED_SERVER)
+                && editGuid == MmkvManager.getSelectServer()
     }
     private val createConfigType by lazy {
         EConfigType.fromInt(intent.getIntExtra("createConfigType", EConfigType.VMESS.value))
@@ -102,11 +93,11 @@ 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 container_allow_insecure: LinearLayout? by lazy { findViewById(R.id.lay_allow_insecure) }
     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 container_sni: LinearLayout? by lazy { findViewById(R.id.lay_sni) }
     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 container_fingerprint: LinearLayout? by lazy { findViewById(R.id.lay_stream_fingerprint) }
     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) }
@@ -115,18 +106,19 @@ class ServerActivity : BaseActivity() {
     private val tv_path: TextView? by lazy { findViewById(R.id.tv_path) }
     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 container_alpn: LinearLayout? by lazy { findViewById(R.id.lay_stream_alpn) }
     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 container_public_key: LinearLayout? by lazy { findViewById(R.id.lay_public_key) }
     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 container_short_id: LinearLayout? by lazy { findViewById(R.id.lay_short_id) }
     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) }
+    private val container_spider_x: LinearLayout? by lazy { findViewById(R.id.lay_spider_x) }
     private val et_reserved1: EditText? by lazy { findViewById(R.id.et_reserved1) }
     private val et_reserved2: EditText? by lazy { findViewById(R.id.et_reserved2) }
     private val et_reserved3: EditText? by lazy { findViewById(R.id.et_reserved3) }
     private val et_local_address: EditText? by lazy { findViewById(R.id.et_local_address) }
     private val et_local_mtu: EditText? by lazy { findViewById(R.id.et_local_mtu) }
+    private val et_obfs_password: EditText? by lazy { findViewById(R.id.et_obfs_password) }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -139,9 +131,11 @@ class ServerActivity : BaseActivity() {
             EConfigType.CUSTOM -> return
             EConfigType.SHADOWSOCKS -> setContentView(R.layout.activity_server_shadowsocks)
             EConfigType.SOCKS -> setContentView(R.layout.activity_server_socks)
+            EConfigType.HTTP -> setContentView(R.layout.activity_server_socks)
             EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
             EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
             EConfigType.WIREGUARD -> setContentView(R.layout.activity_server_wireguard)
+            EConfigType.HYSTERIA2 -> setContentView(R.layout.activity_server_hysteria2)
         }
         sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -258,7 +252,9 @@ class ServerActivity : BaseActivity() {
         et_id.text = Utils.getEditable(outbound.getPassword().orEmpty())
         et_alterId?.text =
             Utils.getEditable(outbound.settings?.vnext?.get(0)?.users?.get(0)?.alterId.toString())
-        if (config.configType == EConfigType.SOCKS) {
+        if (config.configType == EConfigType.SOCKS
+            || config.configType == EConfigType.HTTP
+        ) {
             et_security?.text =
                 Utils.getEditable(outbound.settings?.servers?.get(0)?.users?.get(0)?.user.orEmpty())
         } else if (config.configType == EConfigType.VLESS) {
@@ -290,14 +286,17 @@ class ServerActivity : BaseActivity() {
                     Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
             } else {
                 val list = outbound.settings?.address as List<*>
-                et_local_address?.text = Utils.getEditable(list.joinToString())
+                et_local_address?.text = Utils.getEditable(list.joinToString(","))
             }
             if (outbound.settings?.mtu == null) {
                 et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
             } else {
                 et_local_mtu?.text = Utils.getEditable(outbound.settings?.mtu.toString())
             }
+        } else if (config.configType == EConfigType.HYSTERIA2) {
+            et_obfs_password?.text = Utils.getEditable(outbound.settings?.obfsPassword)
         }
+
         val securityEncryptions =
             if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
         val security =
@@ -322,7 +321,7 @@ class ServerActivity : BaseActivity() {
                 tlsSetting.alpn?.let {
                     val alpnIndex = Utils.arrayFind(
                         alpns,
-                        Utils.removeWhiteSpace(tlsSetting.alpn.joinToString())?:""
+                        Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
                     )
                     sp_stream_alpn?.setSelection(alpnIndex)
                 }
@@ -413,8 +412,14 @@ class ServerActivity : BaseActivity() {
         }
         val config =
             MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(createConfigType)
-        if (config.configType != EConfigType.SOCKS && TextUtils.isEmpty(et_id.text.toString())) {
+        if (config.configType != EConfigType.SOCKS
-            if (config.configType == EConfigType.TROJAN || config.configType == EConfigType.SHADOWSOCKS) {
+            && config.configType != EConfigType.HTTP
+            && TextUtils.isEmpty(et_id.text.toString())
+        ) {
+            if (config.configType == EConfigType.TROJAN
+                || config.configType == EConfigType.SHADOWSOCKS
+                || config.configType == EConfigType.HYSTERIA2
+            ) {
                 toast(R.string.server_lab_id3)
             } else {
                 toast(R.string.server_lab_id)
@@ -446,11 +451,16 @@ class ServerActivity : BaseActivity() {
         wireguard?.peers?.get(0)?.let { _ ->
             savePeer(wireguard, port)
         }
+
         config.outboundBean?.streamSettings?.let {
-            saveStreamSettings(it)
+            val sni = saveStreamSettings(it)
+            saveTls(it, sni)
         }
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
-            config.subscriptionId = subscriptionId?:""
+            config.subscriptionId = subscriptionId.orEmpty()
+        }
+        if (config.configType == EConfigType.HYSTERIA2) {
+            config.outboundBean?.settings?.obfsPassword = et_obfs_password?.text?.toString()
         }
 
         MmkvManager.encodeServerConfig(editGuid, config)
@@ -486,7 +496,7 @@ class ServerActivity : BaseActivity() {
         if (config.configType == EConfigType.SHADOWSOCKS) {
             server.password = et_id.text.toString().trim()
             server.method = shadowsocksSecuritys[sp_security?.selectedItemPosition ?: 0]
-        } else if (config.configType == EConfigType.SOCKS) {
+        } else if (config.configType == EConfigType.SOCKS || config.configType == EConfigType.HTTP) {
             if (TextUtils.isEmpty(et_security?.text) && TextUtils.isEmpty(et_id.text)) {
                 server.users = null
             } else {
@@ -496,7 +506,7 @@ class ServerActivity : BaseActivity() {
                 socksUsersBean.pass = et_id.text.toString().trim()
                 server.users = listOf(socksUsersBean)
             }
-        } else if (config.configType == EConfigType.TROJAN) {
+        } else if (config.configType == EConfigType.TROJAN || config.configType == EConfigType.HYSTERIA2) {
             server.password = et_id.text.toString().trim()
         }
     }
@@ -518,36 +528,39 @@ class ServerActivity : BaseActivity() {
         wireguard.mtu = Utils.parseInt(et_local_mtu?.text.toString())
     }
 
-    private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean) {
+    private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean): String? {
-        val network = sp_network?.selectedItemPosition ?: return
+        val network = sp_network?.selectedItemPosition ?: return null
-        val type = sp_header_type?.selectedItemPosition ?: return
+        val type = sp_header_type?.selectedItemPosition ?: return null
-        val requestHost = et_request_host?.text?.toString()?.trim() ?: return
+        val requestHost = et_request_host?.text?.toString()?.trim() ?: return null
-        val path = et_path?.text?.toString()?.trim() ?: return
+        val path = et_path?.text?.toString()?.trim() ?: return null
-        val sniField = et_sni?.text?.toString()?.trim() ?: return
-        val allowInsecureField = sp_allow_insecure?.selectedItemPosition ?: return
-        val streamSecurity = sp_stream_security?.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(
+        val sni = streamSetting.populateTransportSettings(
-                transport = networks[network],
+            transport = networks[network],
-                headerType = transportTypes(networks[network])[type],
+            headerType = transportTypes(networks[network])[type],
-                host = requestHost,
+            host = requestHost,
-                path = path,
+            path = path,
-                seed = path,
+            seed = path,
-                quicSecurity = requestHost,
+            quicSecurity = requestHost,
-                key = path,
+            key = path,
-                mode = transportTypes(networks[network])[type],
+            mode = transportTypes(networks[network])[type],
-                serviceName = path,
+            serviceName = path,
-                authority = requestHost,
+            authority = requestHost,
         )
-        if (sniField.isNotBlank()) {
+
-            sni = sniField
+        return sni
-        }
+    }
-        val allowInsecure = if (allowinsecures[allowInsecureField].isBlank()) {
+
+    private fun saveTls(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean, sni: String?) {
+        val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
+        val sniField = et_sni?.text?.toString()?.trim()
+        val allowInsecureField = sp_allow_insecure?.selectedItemPosition
+        val utlsIndex = sp_stream_fingerprint?.selectedItemPosition ?: 0
+        val alpnIndex = sp_stream_alpn?.selectedItemPosition ?: 0
+        val publicKey = et_public_key?.text?.toString()
+        val shortId = et_short_id?.text?.toString()
+        val spiderX = et_spider_x?.text?.toString()
+
+        val allowInsecure = if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
             settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
         } else {
             allowinsecures[allowInsecureField].toBoolean()
@@ -556,7 +569,7 @@ class ServerActivity : BaseActivity() {
         streamSetting.populateTlsSettings(
             streamSecurity = streamSecuritys[streamSecurity],
             allowInsecure = allowInsecure,
-            sni = sni,
+            sni = sniField ?: sni ?: "",
             fingerprint = uTlsItems[utlsIndex],
             alpns = alpns[alpnIndex],
             publicKey = publicKey,
@@ -590,7 +603,7 @@ class ServerActivity : BaseActivity() {
      */
     private fun deleteServer(): Boolean {
         if (editGuid.isNotEmpty()) {
-            if (editGuid != mainStorage?.decodeString(KEY_SELECTED_SERVER)) {
+            if (editGuid != MmkvManager.getSelectServer()) {
                 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/ui/ServerCustomConfigActivity.kt

@@ -8,35 +8,31 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.blacksquircle.ui.editorkit.utils.EditorTheme
 import com.blacksquircle.ui.language.json.JsonLanguage
-import com.google.gson.*
+
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.Utils
 import me.drakeet.support.toast.ToastCompat
 
 class ServerCustomConfigActivity : BaseActivity() {
-    private lateinit var binding: ActivityServerCustomConfigBinding
+    private val binding by lazy { ActivityServerCustomConfigBinding.inflate(layoutInflater) }
 
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val serverRawStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
     private val editGuid by lazy { intent.getStringExtra("guid").orEmpty() }
     private val isRunning by lazy {
         intent.getBooleanExtra("isRunning", false)
                 && editGuid.isNotEmpty()
-                && editGuid == mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER)
+                && editGuid == MmkvManager.getSelectServer()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityServerCustomConfigBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
         title = getString(R.string.title_server)
 
         if (!Utils.getDarkModeStatus(this)) {
@@ -56,7 +52,7 @@ class ServerCustomConfigActivity : BaseActivity() {
      */
     private fun bindingServer(config: ServerConfig): Boolean {
         binding.etRemarks.text = Utils.getEditable(config.remarks)
-        val raw = serverRawStorage?.decodeString(editGuid)
+        val raw = MmkvManager.decodeServerRaw(editGuid)
         if (raw.isNullOrBlank()) {
             binding.editor.setTextContent(Utils.getEditable(config.fullConfig?.toPrettyPrinting().orEmpty()))
         } else {
@@ -83,7 +79,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         }
 
         val v2rayConfig = try {
-            Gson().fromJson(binding.editor.text.toString(), V2rayConfig::class.java)
+            JsonUtil.fromJson(binding.editor.text.toString(), V2rayConfig::class.java)
         } catch (e: Exception) {
             e.printStackTrace()
             ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
@@ -91,11 +87,11 @@ class ServerCustomConfigActivity : BaseActivity() {
         }
 
         val config = MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(EConfigType.CUSTOM)
-        config.remarks = v2rayConfig.remarks ?: binding.etRemarks.text.toString().trim()
+        config.remarks = if (binding.etRemarks.text.isNullOrEmpty()) v2rayConfig.remarks.orEmpty() else binding.etRemarks.text.toString()
         config.fullConfig = v2rayConfig
 
         MmkvManager.encodeServerConfig(editGuid, config)
-        serverRawStorage?.encode(editGuid, binding.editor.text.toString())
+        MmkvManager.encodeServerRaw(editGuid, binding.editor.text.toString())
         toast(R.string.toast_success)
         finish()
         return true
@@ -107,14 +103,14 @@ class ServerCustomConfigActivity : BaseActivity() {
     private fun deleteServer(): Boolean {
         if (editGuid.isNotEmpty()) {
             AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                .setPositiveButton(android.R.string.ok) { _, _ ->
-                        MmkvManager.removeServer(editGuid)
+                    MmkvManager.removeServer(editGuid)
-                        finish()
+                    finish()
-                    }
+                }
-                    .setNegativeButton(android.R.string.no) {_, _ ->
+                .setNegativeButton(android.R.string.no) { _, _ ->
-                        // do nothing
+                    // do nothing
-                    }
+                }
-                    .show()
+                .show()
         }
         return true
     }
@@ -141,10 +137,12 @@ class ServerCustomConfigActivity : BaseActivity() {
             deleteServer()
             true
         }
+
         R.id.save_config -> {
             saveServer()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 }

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

@@ -8,17 +8,17 @@ import androidx.activity.viewModels
 import androidx.preference.CheckBoxPreference
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
-import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.multiprocess.RemoteWorkManager
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
+import com.v2ray.ang.extension.toLongEx
 import com.v2ray.ang.service.SubscriptionUpdater
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.SettingsViewModel
 import java.util.concurrent.TimeUnit
@@ -36,7 +36,6 @@ class SettingsActivity : BaseActivity() {
     }
 
     class SettingsFragment : PreferenceFragmentCompat() {
-        private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
         private val perAppProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_PER_APP_PROXY) }
         private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) }
@@ -44,8 +43,6 @@ class SettingsActivity : BaseActivity() {
         private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
         private val vpnDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_DNS) }
 
-        private val routingCustom by lazy { findPreference<Preference>(AppConfig.PREF_ROUTING_CUSTOM) }
-
         private val mux by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_MUX_ENABLED) }
         private val muxConcurrency by lazy { findPreference<EditTextPreference>(AppConfig.PREF_MUX_CONCURRENCY) }
         private val muxXudpConcurrency by lazy { findPreference<EditTextPreference>(AppConfig.PREF_MUX_XUDP_CONCURRENCY) }
@@ -89,11 +86,6 @@ class SettingsActivity : BaseActivity() {
                 true
             }
 
-            routingCustom?.setOnPreferenceClickListener {
-                startActivity(Intent(activity, RoutingSettingsActivity::class.java))
-                false
-            }
-
             mux?.setOnPreferenceChangeListener { _, newValue ->
                 updateMux(newValue as Boolean)
                 true
@@ -128,7 +120,7 @@ class SettingsActivity : BaseActivity() {
                 val value = newValue as Boolean
                 autoUpdateCheck?.isChecked = value
                 autoUpdateInterval?.isEnabled = value
-                autoUpdateInterval?.text?.toLong()?.let {
+                autoUpdateInterval?.text?.toLongEx()?.let {
                     if (newValue) configureUpdateTask(it) else cancelUpdateTask()
                 }
                 true
@@ -138,9 +130,9 @@ class SettingsActivity : BaseActivity() {
 
                 // It must be greater than 15 minutes because WorkManager couldn't run tasks under 15 minutes intervals
                 nval =
-                    if (TextUtils.isEmpty(nval) || nval.toLong() < 15) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
+                    if (TextUtils.isEmpty(nval) || nval.toLongEx() < 15) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
                 autoUpdateInterval?.summary = nval
-                configureUpdateTask(nval.toLong())
+                configureUpdateTask(nval.toLongEx())
                 true
             }
 
@@ -180,11 +172,11 @@ class SettingsActivity : BaseActivity() {
 
         override fun onStart() {
             super.onStart()
-            updateMode(settingsStorage.decodeString(AppConfig.PREF_MODE, "VPN"))
+            updateMode(settingsStorage.decodeString(AppConfig.PREF_MODE, VPN))
             localDns?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
             fakeDns?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_FAKE_DNS_ENABLED, false)
             localDnsPort?.summary = settingsStorage.decodeString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
-            vpnDns?.summary  = settingsStorage.decodeString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
+            vpnDns?.summary = settingsStorage.decodeString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
 
             updateMux(settingsStorage.getBoolean(AppConfig.PREF_MUX_ENABLED, false))
             mux?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_MUX_ENABLED, false)
@@ -198,7 +190,8 @@ class SettingsActivity : BaseActivity() {
             fragmentInterval?.summary = settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
 
             autoUpdateCheck?.isChecked = settingsStorage.getBoolean(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
-            autoUpdateInterval?.summary = settingsStorage.decodeString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL,AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+            autoUpdateInterval?.summary =
+                settingsStorage.decodeString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
             autoUpdateInterval?.isEnabled = settingsStorage.getBoolean(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
 
             socksPort?.summary = settingsStorage.decodeString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
@@ -237,6 +230,7 @@ class SettingsActivity : BaseActivity() {
 
             listOf(
                 AppConfig.PREF_ROUTE_ONLY_ENABLED,
+                AppConfig.PREF_IS_BOOTED,
                 AppConfig.PREF_BYPASS_APPS,
                 AppConfig.PREF_SPEED_ENABLED,
                 AppConfig.PREF_CONFIRM_REMOVE,
@@ -251,7 +245,6 @@ class SettingsActivity : BaseActivity() {
 
             listOf(
                 AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
-                AppConfig.PREF_ROUTING_MODE,
                 AppConfig.PREF_MUX_XUDP_QUIC,
                 AppConfig.PREF_FRAGMENT_PACKETS,
                 AppConfig.PREF_LANGUAGE,
@@ -266,7 +259,7 @@ class SettingsActivity : BaseActivity() {
         }
 
         private fun updateMode(mode: String?) {
-            val vpn = mode == "VPN"
+            val vpn = mode == VPN
             perAppProxy?.isEnabled = vpn
             perAppProxy?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_PER_APP_PROXY, false)
             localDns?.isEnabled = vpn
@@ -350,12 +343,15 @@ class SettingsActivity : BaseActivity() {
                 updateFragmentInterval(settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20"))
             }
         }
+
         private fun updateFragmentPackets(value: String?) {
             fragmentPackets?.summary = value.toString()
         }
+
         private fun updateFragmentLength(value: String?) {
             fragmentLength?.summary = value.toString()
         }
+
         private fun updateFragmentInterval(value: String?) {
             fragmentInterval?.summary = value.toString()
         }

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

@@ -5,42 +5,32 @@ import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
-import androidx.work.Constraints
+import androidx.lifecycle.lifecycleScope
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
-import androidx.work.PeriodicWorkRequest
-import androidx.work.multiprocess.RemoteWorkManager
-import com.google.gson.Gson
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AngApplication
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubEditBinding
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.service.SubscriptionUpdater
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.Utils
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class SubEditActivity : BaseActivity() {
-    private lateinit var binding: ActivitySubEditBinding
+    private val binding by lazy { ActivitySubEditBinding.inflate(layoutInflater) }
 
     var del_config: MenuItem? = null
     var save_config: MenuItem? = null
 
-    private val subStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SUB, MMKV.MULTI_PROCESS_MODE) }
     private val editSubId by lazy { intent.getStringExtra("subId").orEmpty() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySubEditBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
         title = getString(R.string.title_sub_setting)
 
-        val json = subStorage?.decodeString(editSubId)
+        val subItem = MmkvManager.decodeSubscription(editSubId)
-        if (!json.isNullOrBlank()) {
+        if (subItem != null) {
-            bindingServer(Gson().fromJson(json, SubscriptionItem::class.java))
+            bindingServer(subItem)
         } else {
             clearServer()
         }
@@ -52,8 +42,11 @@ class SubEditActivity : BaseActivity() {
     private fun bindingServer(subItem: SubscriptionItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(subItem.remarks)
         binding.etUrl.text = Utils.getEditable(subItem.url)
+        binding.etFilter.text = Utils.getEditable(subItem.filter)
         binding.chkEnable.isChecked = subItem.enabled
         binding.autoUpdateCheck.isChecked = subItem.autoUpdate
+        binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile)
+        binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile)
         return true
     }
 
@@ -63,7 +56,10 @@ class SubEditActivity : BaseActivity() {
     private fun clearServer(): Boolean {
         binding.etRemarks.text = null
         binding.etUrl.text = null
+        binding.etFilter.text = null
         binding.chkEnable.isChecked = true
+        binding.etPreProfile.text = null
+        binding.etNextProfile.text = null
         return true
     }
 
@@ -71,20 +67,15 @@ class SubEditActivity : BaseActivity() {
      * save server config
      */
     private fun saveServer(): Boolean {
-        val subItem: SubscriptionItem
+        val subItem = MmkvManager.decodeSubscription(editSubId) ?: SubscriptionItem()
-        val json = subStorage?.decodeString(editSubId)
-        var subId = editSubId
-        if (!json.isNullOrBlank()) {
-            subItem = Gson().fromJson(json, SubscriptionItem::class.java)
-        } else {
-            subId = Utils.getUuid()
-            subItem = SubscriptionItem()
-        }
 
         subItem.remarks = binding.etRemarks.text.toString()
         subItem.url = binding.etUrl.text.toString()
+        subItem.filter = binding.etFilter.text.toString()
         subItem.enabled = binding.chkEnable.isChecked
         subItem.autoUpdate = binding.autoUpdateCheck.isChecked
+        subItem.prevProfile = binding.etPreProfile.text.toString()
+        subItem.nextProfile = binding.etNextProfile.text.toString()
 
         if (TextUtils.isEmpty(subItem.remarks)) {
             toast(R.string.sub_setting_remarks)
@@ -95,7 +86,7 @@ class SubEditActivity : BaseActivity() {
 //            return false
 //        }
 
-        subStorage?.encode(subId, Gson().toJson(subItem))
+        MmkvManager.encodeSubscription(editSubId, subItem)
         toast(R.string.toast_success)
         finish()
         return true
@@ -107,14 +98,18 @@ class SubEditActivity : BaseActivity() {
     private fun deleteServer(): Boolean {
         if (editSubId.isNotEmpty()) {
             AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    lifecycleScope.launch(Dispatchers.IO) {
                         MmkvManager.removeSubscription(editSubId)
-                        finish()
+                        launch(Dispatchers.Main) {
+                            finish()
+                        }
                     }
-                    .setNegativeButton(android.R.string.no) {_, _ ->
+                }
-                        // do nothing
+                .setNegativeButton(android.R.string.no) { _, _ ->
-                    }
+                    // do nothing
-                    .show()
+                }
+                .show()
         }
         return true
     }
@@ -136,10 +131,12 @@ class SubEditActivity : BaseActivity() {
             deleteServer()
             true
         }
+
         R.id.save_config -> {
             saveServer()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 

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

@@ -6,12 +6,14 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.util.AngConfigManager
 import com.v2ray.ang.util.MmkvManager
 import kotlinx.coroutines.Dispatchers
@@ -19,28 +21,29 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 class SubSettingActivity : BaseActivity() {
-    private lateinit var binding: ActivitySubSettingBinding
+    private val binding by lazy { ActivitySubSettingBinding.inflate(layoutInflater) }
 
     var subscriptions: List<Pair<String, SubscriptionItem>> = listOf()
     private val adapter by lazy { SubSettingRecyclerAdapter(this) }
+    private var mItemTouchHelper: ItemTouchHelper? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySubSettingBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         title = getString(R.string.title_sub_setting)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = adapter
+
+        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
+        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
     }
 
     override fun onResume() {
         super.onResume()
-        subscriptions = MmkvManager.decodeSubscriptions()
+        refreshData()
-        adapter.notifyDataSetChanged()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -79,4 +82,9 @@ class SubSettingActivity : BaseActivity() {
         else -> super.onOptionsItemSelected(item)
 
     }
+
+    fun refreshData() {
+        subscriptions = MmkvManager.decodeSubscriptions()
+        adapter.notifyDataSetChanged()
+    }
 }

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

@@ -8,21 +8,20 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
-import com.google.gson.Gson
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.helper.ItemTouchHelperAdapter
+import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
+import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 
-class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
+class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {
-    RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>() {
 
     private var mActivity: SubSettingActivity = activity
-    private val subStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SUB, MMKV.MULTI_PROCESS_MODE) }
 
     private val share_method: Array<out String> by lazy {
         mActivity.resources.getStringArray(R.array.share_sub_method)
@@ -35,11 +34,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
         val subItem = mActivity.subscriptions[position].second
         holder.itemSubSettingBinding.tvName.text = subItem.remarks
         holder.itemSubSettingBinding.tvUrl.text = subItem.url
-        if (subItem.enabled) {
+        holder.itemSubSettingBinding.chkEnable.isChecked = subItem.enabled
-            holder.itemSubSettingBinding.chkEnable.setBackgroundResource(R.color.colorAccent)
-        } else {
-            holder.itemSubSettingBinding.chkEnable.setBackgroundResource(0)
-        }
         holder.itemView.setBackgroundColor(Color.TRANSPARENT)
 
         holder.itemSubSettingBinding.layoutEdit.setOnClickListener {
@@ -48,10 +43,12 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
                     .putExtra("subId", subId)
             )
         }
-        holder.itemSubSettingBinding.infoContainer.setOnClickListener {
+
-            subItem.enabled = !subItem.enabled
+        holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
-            subStorage?.encode(subId, Gson().toJson(subItem))
+            if( !it.isPressed) return@setOnCheckedChangeListener
-            notifyItemChanged(position)
+            subItem.enabled = isChecked
+            MmkvManager.encodeSubscription(subId, subItem)
+
         }
 
         if (TextUtils.isEmpty(subItem.url)) {
@@ -99,5 +96,28 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
     }
 
     class MainViewHolder(val itemSubSettingBinding: ItemRecyclerSubSettingBinding) :
-        RecyclerView.ViewHolder(itemSubSettingBinding.root)
+        BaseViewHolder(itemSubSettingBinding.root), ItemTouchHelperViewHolder
+
+    open class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        fun onItemSelected() {
+            itemView.setBackgroundColor(Color.LTGRAY)
+        }
+
+        fun onItemClear() {
+            itemView.setBackgroundColor(0)
+        }
+    }
+
+    override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
+        SettingsManager.swapSubscriptions(fromPosition, toPosition)
+        notifyItemMoved(fromPosition, toPosition)
+        return true
+    }
+
+    override fun onItemMoveCompleted() {
+        mActivity.refreshData()
+    }
+
+    override fun onItemDismiss(position: Int) {
+    }
 }

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

@@ -1,48 +1,43 @@
 package com.v2ray.ang.ui
 
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.view.View
-import android.widget.ArrayAdapter
-import android.widget.ListView
-import java.util.ArrayList
-import com.v2ray.ang.R
 import android.content.Intent
+import android.os.Bundle
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
-import com.tencent.mmkv.MMKV
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.ListView
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityTaskerBinding
 import com.v2ray.ang.util.MmkvManager
 
 class TaskerActivity : BaseActivity() {
-    private lateinit var binding: ActivityTaskerBinding
+    private val binding by lazy { ActivityTaskerBinding.inflate(layoutInflater) }
 
     private var listview: ListView? = null
     private var lstData: ArrayList<String> = ArrayList()
     private var lstGuid: ArrayList<String> = ArrayList()
 
-    private val serverStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityTaskerBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         //add def value
         lstData.add("Default")
         lstGuid.add(AppConfig.TASKER_DEFAULT_GUID)
 
-        serverStorage?.allKeys()?.forEach { key ->
+        MmkvManager.decodeServerList()?.forEach { key ->
             MmkvManager.decodeServerConfig(key)?.let { config ->
                 lstData.add(config.remarks)
                 lstGuid.add(key)
             }
         }
-        val adapter = ArrayAdapter(this,
+        val adapter = ArrayAdapter(
-                android.R.layout.simple_list_item_single_choice, lstData)
+            this,
+            android.R.layout.simple_list_item_single_choice, lstData
+        )
         listview = findViewById<View>(R.id.listview) as ListView
         listview?.adapter = adapter
 
@@ -90,7 +85,7 @@ class TaskerActivity : BaseActivity() {
 
         intent.putExtra(AppConfig.TASKER_EXTRA_BUNDLE, extraBundle)
         intent.putExtra(AppConfig.TASKER_EXTRA_STRING_BLURB, blurb)
-        setResult(AppCompatActivity.RESULT_OK, intent)
+        setResult(RESULT_OK, intent)
         finish()
     }
 
@@ -105,10 +100,12 @@ class TaskerActivity : BaseActivity() {
         R.id.del_config -> {
             true
         }
+
         R.id.save_config -> {
             confirmFinish()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 

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

@@ -11,34 +11,32 @@ import com.v2ray.ang.util.AngConfigManager
 import java.net.URLDecoder
 
 class UrlSchemeActivity : BaseActivity() {
-    private lateinit var binding: ActivityLogcatBinding
+    private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityLogcatBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
 
         try {
             intent.apply {
                 if (action == Intent.ACTION_SEND) {
                     if ("text/plain" == type) {
                         intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
-                            parseUri(it)
+                            parseUri(it, null)
                         }
                     }
                 } else if (action == Intent.ACTION_VIEW) {
                     when (data?.host) {
                         "install-config" -> {
                             val uri: Uri? = intent.data
-                            val shareUrl = uri?.getQueryParameter("url") ?: ""
+                            val shareUrl = uri?.getQueryParameter("url").orEmpty()
-                            parseUri(shareUrl)
+                            parseUri(shareUrl, uri?.fragment)
                         }
 
                         "install-sub" -> {
                             val uri: Uri? = intent.data
-                            val shareUrl = uri?.getQueryParameter("url") ?: ""
+                            val shareUrl = uri?.getQueryParameter("url").orEmpty()
-                            parseUri(shareUrl)
+                            parseUri(shareUrl, uri?.fragment)
                         }
 
                         else -> {
@@ -55,17 +53,21 @@ class UrlSchemeActivity : BaseActivity() {
         }
     }
 
-    private fun parseUri(uriString: String?) {
+    private fun parseUri(uriString: String?, fragment: String?) {
         if (uriString.isNullOrEmpty()) {
             return
         }
         Log.d("UrlScheme", uriString)
 
-        val decodedUrl = URLDecoder.decode(uriString, "UTF-8")
+        var decodedUrl = URLDecoder.decode(uriString, "UTF-8")
         val uri = Uri.parse(decodedUrl)
         if (uri != null) {
-            val count = AngConfigManager.importBatchConfig(decodedUrl, "", false)
+            if (uri.fragment.isNullOrEmpty() && !fragment.isNullOrEmpty()) {
-            if (count > 0) {
+                decodedUrl += "#${fragment}"
+            }
+            Log.d("UrlScheme-decodedUrl", decodedUrl)
+            val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
+            if (count + countSub > 0) {
                 toast(R.string.import_subscription_success)
             } else {
                 toast(R.string.import_subscription_failure)

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

@@ -2,30 +2,36 @@ package com.v2ray.ang.ui
 
 import android.Manifest
 import android.annotation.SuppressLint
+import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.OpenableColumns
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.gson.Gson
+import com.tbruyelle.rxpermissions3.RxPermissions
-import com.tbruyelle.rxpermissions.RxPermissions
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.ItemRecyclerUserAssetBinding
+import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.toTrafficString
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -36,12 +42,10 @@ import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URL
 import java.text.DateFormat
-import java.util.*
+import java.util.Date
 
 class UserAssetActivity : BaseActivity() {
-    private lateinit var binding: ActivitySubSettingBinding
+    private val binding by lazy { ActivitySubSettingBinding.inflate(layoutInflater) }
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
-    private val assetStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_ASSET, MMKV.MULTI_PROCESS_MODE) }
 
     val extDir by lazy { File(Utils.userAssetPath(this)) }
     val builtInGeoFiles = arrayOf("geosite.dat", "geoip.dat")
@@ -49,9 +53,7 @@ class UserAssetActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySubSettingBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
         title = getString(R.string.title_user_asset_setting)
 
         binding.recyclerView.setHasFixedSize(true)
@@ -80,6 +82,7 @@ class UserAssetActivity : BaseActivity() {
             startActivity(intent)
             true
         }
+
         R.id.download_file -> {
             downloadGeoFiles()
             true
@@ -97,24 +100,24 @@ class UserAssetActivity : BaseActivity() {
         RxPermissions(this)
             .request(permission)
             .subscribe {
-            if (it) {
+                if (it) {
-                val intent = Intent(Intent.ACTION_GET_CONTENT)
+                    val intent = Intent(Intent.ACTION_GET_CONTENT)
-                intent.type = "*/*"
+                    intent.type = "*/*"
-                intent.addCategory(Intent.CATEGORY_OPENABLE)
+                    intent.addCategory(Intent.CATEGORY_OPENABLE)
 
-                try {
+                    try {
-                    chooseFile.launch(
+                        chooseFile.launch(
-                        Intent.createChooser(
+                            Intent.createChooser(
-                            intent,
+                                intent,
-                            getString(R.string.title_file_chooser)
+                                getString(R.string.title_file_chooser)
+                            )
                         )
-                    )
+                    } catch (ex: android.content.ActivityNotFoundException) {
-                } catch (ex: android.content.ActivityNotFoundException) {
+                        toast(R.string.toast_require_file_manager)
-                    toast(R.string.toast_require_file_manager)
+                    }
-                }
+                } else
-            } else
+                    toast(R.string.toast_permission_denied)
-                toast(R.string.toast_permission_denied)
+            }
-        }
     }
 
     private val chooseFile =
@@ -134,7 +137,7 @@ class UserAssetActivity : BaseActivity() {
                         toast(R.string.msg_remark_is_duplicate)
                         return@registerForActivityResult
                     }
-                    assetStorage?.encode(assetId, Gson().toJson(assetItem))
+                    MmkvManager.encodeAsset(assetId, assetItem)
                     copyFile(uri)
                 } catch (e: Exception) {
                     toast(R.string.toast_asset_copy_failed)
@@ -168,9 +171,13 @@ class UserAssetActivity : BaseActivity() {
     }
 
     private fun downloadGeoFiles() {
-        val httpPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+        val dialog = AlertDialog.Builder(this)
-
+            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+            .setCancelable(false)
+            .show()
         toast(R.string.msg_downloading_content)
+
+        val httpPort = SettingsManager.getHttpPort()
         var assets = MmkvManager.decodeAssetUrls()
         assets = addBuiltInGeoItems(assets)
 
@@ -188,6 +195,7 @@ class UserAssetActivity : BaseActivity() {
                     } else {
                         toast(getString(R.string.toast_failure) + " " + it.second.remarks)
                     }
+                    dialog.dismiss()
                 }
             }
         }
@@ -206,7 +214,7 @@ class UserAssetActivity : BaseActivity() {
                 URL(item.url).openConnection(
                     Proxy(
                         Proxy.Type.HTTP,
-                        InetSocketAddress("127.0.0.1", httpPort)
+                        InetSocketAddress(LOOPBACK, httpPort)
                     )
                 ) as HttpURLConnection
             }
@@ -229,15 +237,18 @@ class UserAssetActivity : BaseActivity() {
             conn?.disconnect()
         }
     }
+
     private fun addBuiltInGeoItems(assets: List<Pair<String, AssetUrlItem>>): List<Pair<String, AssetUrlItem>> {
         val list = mutableListOf<Pair<String, AssetUrlItem>>()
         builtInGeoFiles
             .filter { geoFile -> assets.none { it.second.remarks == geoFile } }
-            .forEach { 
+            .forEach {
-                list.add(Utils.getUuid() to AssetUrlItem(
+                list.add(
-                    it,
+                    Utils.getUuid() to AssetUrlItem(
-                    AppConfig.GeoUrl + it
+                        it,
-                ))
+                        AppConfig.GeoUrl + it
+                    )
+                )
             }
 
         return list + assets
@@ -249,14 +260,15 @@ class UserAssetActivity : BaseActivity() {
                 ItemRecyclerUserAssetBinding.inflate(
                     LayoutInflater.from(parent.context),
                     parent,
-                    false)
+                    false
+                )
             )
         }
 
         @SuppressLint("SetTextI18n")
         override fun onBindViewHolder(holder: UserAssetViewHolder, position: Int) {
-            var assets = MmkvManager.decodeAssetUrls();
+            var assets = MmkvManager.decodeAssetUrls()
-            assets = addBuiltInGeoItems(assets);
+            assets = addBuiltInGeoItems(assets)
             val item = assets.getOrNull(position) ?: return
 //            file with name == item.second.remarks
             val file = extDir.listFiles()?.find { it.name == item.second.remarks }
@@ -292,8 +304,8 @@ class UserAssetActivity : BaseActivity() {
         }
 
         override fun getItemCount(): Int {
-            var assets = MmkvManager.decodeAssetUrls();
+            var assets = MmkvManager.decodeAssetUrls()
-            assets = addBuiltInGeoItems(assets);
+            assets = addBuiltInGeoItems(assets)
             return assets.size
         }
     }

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

@@ -5,8 +5,6 @@ import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
-import com.google.gson.Gson
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityUserAssetUrlBinding
 import com.v2ray.ang.dto.AssetUrlItem
@@ -16,25 +14,22 @@ import com.v2ray.ang.util.Utils
 import java.io.File
 
 class UserAssetUrlActivity : BaseActivity() {
-    private lateinit var binding: ActivityUserAssetUrlBinding
+    private val binding by lazy { ActivityUserAssetUrlBinding.inflate(layoutInflater) }
 
     var del_config: MenuItem? = null
     var save_config: MenuItem? = null
 
     val extDir by lazy { File(Utils.userAssetPath(this)) }
-    private val assetStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_ASSET, MMKV.MULTI_PROCESS_MODE) }
     private val editAssetId by lazy { intent.getStringExtra("assetId").orEmpty() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityUserAssetUrlBinding.inflate(layoutInflater)
+        setContentView(binding.root)
-        val view = binding.root
-        setContentView(view)
         title = getString(R.string.title_user_asset_add_url)
 
-        val json = assetStorage?.decodeString(editAssetId)
+        val assetItem = MmkvManager.decodeAsset(editAssetId)
-        if (!json.isNullOrBlank()) {
+        if (assetItem != null) {
-            bindingAsset(Gson().fromJson(json, AssetUrlItem::class.java))
+            bindingAsset(assetItem)
         } else {
             clearAsset()
         }
@@ -62,12 +57,9 @@ class UserAssetUrlActivity : BaseActivity() {
      * save asset config
      */
     private fun saveServer(): Boolean {
-        val assetItem: AssetUrlItem
+        var assetItem = MmkvManager.decodeAsset(editAssetId)
-        val json = assetStorage?.decodeString(editAssetId)
         var assetId = editAssetId
-        if (!json.isNullOrBlank()) {
+        if (assetItem != null) {
-            assetItem = Gson().fromJson(json, AssetUrlItem::class.java)
-
             // remove file associated with the asset
             val file = extDir.resolve(assetItem.remarks)
             if (file.exists()) {
@@ -98,7 +90,7 @@ class UserAssetUrlActivity : BaseActivity() {
             return false
         }
 
-        assetStorage?.encode(assetId, Gson().toJson(assetItem))
+        MmkvManager.encodeAsset(assetId, assetItem)
         toast(R.string.toast_success)
         finish()
         return true
@@ -114,7 +106,7 @@ class UserAssetUrlActivity : BaseActivity() {
                     MmkvManager.removeAssetUrl(editAssetId)
                     finish()
                 }
-                .setNegativeButton(android.R.string.no) {_, _ ->
+                .setNegativeButton(android.R.string.no) { _, _ ->
                     // do nothing
                 }
                 .show()
@@ -139,10 +131,12 @@ class UserAssetUrlActivity : BaseActivity() {
             deleteServer()
             true
         }
+
         R.id.save_config -> {
             saveServer()
             true
         }
+
         else -> super.onOptionsItemSelected(item)
     }
 }

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

@@ -4,17 +4,17 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.reflect.TypeToken
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.*
-import com.v2ray.ang.util.MmkvManager.KEY_SELECTED_SERVER
+import com.v2ray.ang.util.fmt.Hysteria2Fmt
 import com.v2ray.ang.util.fmt.ShadowsocksFmt
 import com.v2ray.ang.util.fmt.SocksFmt
 import com.v2ray.ang.util.fmt.TrojanFmt
@@ -22,191 +22,17 @@ import com.v2ray.ang.util.fmt.VlessFmt
 import com.v2ray.ang.util.fmt.VmessFmt
 import com.v2ray.ang.util.fmt.WireguardFmt
 import java.lang.reflect.Type
+import java.net.URI
 import java.util.*
 
 object AngConfigManager {
-    private val mainStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_MAIN,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val serverRawStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SERVER_RAW,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val subStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SUB, MMKV.MULTI_PROCESS_MODE) }
-
-    /**
-     * Legacy loading config
-     */
-//    fun migrateLegacyConfig(c: Context): Boolean? {
-//        try {
-//            val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(c)
-//            val context = defaultSharedPreferences.getString(ANG_CONFIG, "")
-//            if (context.isNullOrBlank()) {
-//                return null
-//            }
-//            val angConfig = Gson().fromJson(context, AngConfig::class.java)
-//            for (i in angConfig.vmess.indices) {
-//                upgradeServerVersion(angConfig.vmess[i])
-//            }
-//
-//            copyLegacySettings(defaultSharedPreferences)
-//            migrateVmessBean(angConfig, defaultSharedPreferences)
-//            migrateSubItemBean(angConfig)
-//
-//            defaultSharedPreferences.edit().remove(ANG_CONFIG).apply()
-//            return true
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//        }
-//        return false
-//    }
-//
-//    private fun copyLegacySettings(sharedPreferences: SharedPreferences) {
-//        listOf(
-//            AppConfig.PREF_MODE,
-//            AppConfig.PREF_REMOTE_DNS,
-//            AppConfig.PREF_DOMESTIC_DNS,
-//            AppConfig.PREF_LOCAL_DNS_PORT,
-//            AppConfig.PREF_SOCKS_PORT,
-//            AppConfig.PREF_HTTP_PORT,
-//            AppConfig.PREF_LOGLEVEL,
-//            AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
-//            AppConfig.PREF_ROUTING_MODE,
-//            AppConfig.PREF_V2RAY_ROUTING_AGENT,
-//            AppConfig.PREF_V2RAY_ROUTING_BLOCKED,
-//            AppConfig.PREF_V2RAY_ROUTING_DIRECT,
-//        ).forEach { key ->
-//            settingsStorage?.encode(key, sharedPreferences.getString(key, null))
-//        }
-//        listOf(
-//            AppConfig.PREF_SPEED_ENABLED,
-//            AppConfig.PREF_PROXY_SHARING,
-//            AppConfig.PREF_LOCAL_DNS_ENABLED,
-//            AppConfig.PREF_ALLOW_INSECURE,
-//            AppConfig.PREF_PREFER_IPV6,
-//            AppConfig.PREF_PER_APP_PROXY,
-//            AppConfig.PREF_BYPASS_APPS,
-//        ).forEach { key ->
-//            settingsStorage?.encode(key, sharedPreferences.getBoolean(key, false))
-//        }
-//        settingsStorage?.encode(
-//            AppConfig.PREF_SNIFFING_ENABLED,
-//            sharedPreferences.getBoolean(AppConfig.PREF_SNIFFING_ENABLED, true)
-//        )
-//        settingsStorage?.encode(
-//            AppConfig.PREF_PER_APP_PROXY_SET,
-//            sharedPreferences.getStringSet(AppConfig.PREF_PER_APP_PROXY_SET, setOf())
-//        )
-//    }
-//
-//    private fun migrateVmessBean(angConfig: AngConfig, sharedPreferences: SharedPreferences) {
-//        angConfig.vmess.forEachIndexed { index, vmessBean ->
-//            val type = EConfigType.fromInt(vmessBean.configType) ?: return@forEachIndexed
-//            val config = ServerConfig.create(type)
-//            config.remarks = vmessBean.remarks
-//            config.subscriptionId = vmessBean.subid
-//            if (type == EConfigType.CUSTOM) {
-//                val jsonConfig = sharedPreferences.getString(ANG_CONFIG + vmessBean.guid, "")
-//                val v2rayConfig = try {
-//                    Gson().fromJson(jsonConfig, V2rayConfig::class.java)
-//                } catch (e: Exception) {
-//                    e.printStackTrace()
-//                    return@forEachIndexed
-//                }
-//                config.fullConfig = v2rayConfig
-//                serverRawStorage?.encode(vmessBean.guid, jsonConfig)
-//            } else {
-//                config.outboundBean?.settings?.vnext?.get(0)?.let { vnext ->
-//                    vnext.address = vmessBean.address
-//                    vnext.port = vmessBean.port
-//                    vnext.users[0].id = vmessBean.id
-//                    if (config.configType == EConfigType.VMESS) {
-//                        vnext.users[0].alterId = vmessBean.alterId
-//                        vnext.users[0].security = vmessBean.security
-//                    } else if (config.configType == EConfigType.VLESS) {
-//                        vnext.users[0].encryption = vmessBean.security
-//                        vnext.users[0].flow = vmessBean.flow
-//                    }
-//                }
-//                config.outboundBean?.settings?.servers?.get(0)?.let { server ->
-//                    server.address = vmessBean.address
-//                    server.port = vmessBean.port
-//                    if (config.configType == EConfigType.SHADOWSOCKS) {
-//                        server.password = vmessBean.id
-//                        server.method = vmessBean.security
-//                    } else if (config.configType == EConfigType.SOCKS) {
-//                        if (TextUtils.isEmpty(vmessBean.security) && TextUtils.isEmpty(vmessBean.id)) {
-//                            server.users = null
-//                        } else {
-//                            val socksUsersBean =
-//                                V2rayConfig.OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
-//                            socksUsersBean.user = vmessBean.security
-//                            socksUsersBean.pass = vmessBean.id
-//                            server.users = listOf(socksUsersBean)
-//                        }
-//                    } else if (config.configType == EConfigType.TROJAN) {
-//                        server.password = vmessBean.id
-//                    }
-//                }
-//                config.outboundBean?.streamSettings?.let { streamSetting ->
-//                    val sni = streamSetting.populateTransportSettings(
-//                        vmessBean.network,
-//                        vmessBean.headerType,
-//                        vmessBean.requestHost,
-//                        vmessBean.path,
-//                        vmessBean.path,
-//                        vmessBean.requestHost,
-//                        vmessBean.path,
-//                        vmessBean.headerType,
-//                        vmessBean.path,
-//                        vmessBean.requestHost,
-//                    )
-//                    val allowInsecure = if (vmessBean.allowInsecure.isBlank()) {
-//                        settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
-//                    } else {
-//                        vmessBean.allowInsecure.toBoolean()
-//                    }
-//                    var fingerprint = streamSetting.tlsSettings?.fingerprint
-//                    streamSetting.populateTlsSettings(
-//                        vmessBean.streamSecurity, allowInsecure,
-//                        vmessBean.sni.ifBlank { sni }, fingerprint, null, null, null, null
-//                    )
-//                }
-//            }
-//            val key = MmkvManager.encodeServerConfig(vmessBean.guid, config)
-//            if (index == angConfig.index) {
-//                mainStorage?.encode(KEY_SELECTED_SERVER, key)
-//            }
-//        }
-//    }
-//
-//    private fun migrateSubItemBean(angConfig: AngConfig) {
-//        angConfig.subItem.forEach {
-//            val subItem = SubscriptionItem()
-//            subItem.remarks = it.remarks
-//            subItem.url = it.url
-//            subItem.enabled = it.enabled
-//            subStorage?.encode(it.id, Gson().toJson(subItem))
-//        }
-//    }
-
     /**
      * parse config form qrcode or...
      */
     private fun parseConfig(
         str: String?,
         subid: String,
+        subItem: SubscriptionItem?,
         removedSelectedServer: ServerConfig?
     ): Int {
         try {
@@ -215,17 +41,19 @@ object AngConfigManager {
             }
 
             val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) {
-                VmessFmt.parseVmess(str)
+                VmessFmt.parse(str)
             } else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
-                ShadowsocksFmt.parseShadowsocks(str)
+                ShadowsocksFmt.parse(str)
             } else if (str.startsWith(EConfigType.SOCKS.protocolScheme)) {
-                SocksFmt.parseSocks(str)
+                SocksFmt.parse(str)
             } else if (str.startsWith(EConfigType.TROJAN.protocolScheme)) {
-                TrojanFmt.parseTrojan(str)
+                TrojanFmt.parse(str)
             } else if (str.startsWith(EConfigType.VLESS.protocolScheme)) {
-                VlessFmt.parseVless(str)
+                VlessFmt.parse(str)
             } else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
-                WireguardFmt.parseWireguard(str)
+                WireguardFmt.parse(str)
+            } else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme) || str.startsWith(HY2)) {
+                Hysteria2Fmt.parse(str)
             } else {
                 null
             }
@@ -233,6 +61,13 @@ object AngConfigManager {
             if (config == null) {
                 return R.string.toast_incorrect_protocol
             }
+            //filter
+            if (subItem?.filter != null && subItem.filter?.isNotEmpty() == true && config.remarks.isNotEmpty()) {
+                val matched = Regex(pattern = subItem.filter ?: "")
+                    .containsMatchIn(input = config.remarks)
+                if (!matched) return -1
+            }
+
             config.subscriptionId = subid
             val guid = MmkvManager.encodeServerConfig("", config)
             if (removedSelectedServer != null &&
@@ -243,7 +78,7 @@ object AngConfigManager {
                     ?.getServerPort() == removedSelectedServer.getProxyOutbound()
                     ?.getServerPort()
             ) {
-                mainStorage?.encode(KEY_SELECTED_SERVER, guid)
+                MmkvManager.setSelectServer(guid)
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -264,9 +99,11 @@ object AngConfigManager {
                 EConfigType.CUSTOM -> ""
                 EConfigType.SHADOWSOCKS -> ShadowsocksFmt.toUri(config)
                 EConfigType.SOCKS -> SocksFmt.toUri(config)
+                EConfigType.HTTP -> ""
                 EConfigType.VLESS -> VlessFmt.toUri(config)
                 EConfigType.TROJAN -> TrojanFmt.toUri(config)
                 EConfigType.WIREGUARD -> WireguardFmt.toUri(config)
+                EConfigType.HYSTERIA2 -> Hysteria2Fmt.toUri(config)
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -353,40 +190,7 @@ object AngConfigManager {
         return 0
     }
 
-//    /**
+    fun importBatchConfig(server: String?, subid: String, append: Boolean): Pair<Int, Int> {
-//     * upgrade
-//     */
-//    private fun upgradeServerVersion(vmess: AngConfig.VmessBean): Int {
-//        try {
-//            if (vmess.configVersion == 2) {
-//                return 0
-//            }
-//
-//            when (vmess.network) {
-//                "ws", "h2" -> {
-//                    var path = ""
-//                    var host = ""
-//                    val lstParameter = vmess.requestHost.split(";")
-//                    if (lstParameter.isNotEmpty()) {
-//                        path = lstParameter[0].trim()
-//                    }
-//                    if (lstParameter.size > 1) {
-//                        path = lstParameter[0].trim()
-//                        host = lstParameter[1].trim()
-//                    }
-//                    vmess.path = path
-//                    vmess.requestHost = host
-//                }
-//            }
-//            vmess.configVersion = 2
-//            return 0
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return -1
-//        }
-//    }
-
-    fun importBatchConfig(server: String?, subid: String, append: Boolean): Int {
         var count = parseBatchConfig(Utils.decode(server), subid, append)
         if (count <= 0) {
             count = parseBatchConfig(server, subid, append)
@@ -403,7 +207,7 @@ object AngConfigManager {
             updateConfigViaSubAll()
         }
 
-        return count + countSub
+        return count to countSub
     }
 
     fun parseBatchSubscription(servers: String?): Int {
@@ -416,7 +220,7 @@ object AngConfigManager {
             servers.lines()
                 .forEach { str ->
                     if (str.startsWith(AppConfig.PROTOCOL_HTTP) || str.startsWith(AppConfig.PROTOCOL_HTTPS)) {
-                        count += MmkvManager.importUrlAsSubscription(str)
+                        count += importUrlAsSubscription(str)
                     }
                 }
             return count
@@ -434,7 +238,7 @@ object AngConfigManager {
             val removedSelectedServer =
                 if (!TextUtils.isEmpty(subid) && !append) {
                     MmkvManager.decodeServerConfig(
-                        mainStorage?.decodeString(KEY_SELECTED_SERVER) ?: ""
+                        MmkvManager.getSelectServer().orEmpty()
                     )?.let {
                         if (it.subscriptionId == subid) {
                             return@let it
@@ -448,11 +252,12 @@ object AngConfigManager {
                 MmkvManager.removeServerViaSubid(subid)
             }
 
+            val subItem = MmkvManager.decodeSubscription(subid)
             var count = 0
             servers.lines()
                 .reversed()
                 .forEach {
-                    val resId = parseConfig(it, subid, removedSelectedServer)
+                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
                     if (resId == 0) {
                         count++
                     }
@@ -473,34 +278,21 @@ object AngConfigManager {
             && server.contains("routing")
         ) {
             try {
-                //val gson = GsonBuilder().setPrettyPrinting().create()
-                val gson = GsonBuilder()
-                    .setPrettyPrinting()
-                    .disableHtmlEscaping()
-                    .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
-                        object : TypeToken<Double>() {}.type,
-                        JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? ->
-                            JsonPrimitive(
-                                src?.toInt()
-                            )
-                        }
-                    )
-                    .create()
                 val serverList: Array<Any> =
-                    Gson().fromJson(server, Array<Any>::class.java)
+                    JsonUtil.fromJson(server, Array<Any>::class.java)
 
                 if (serverList.isNotEmpty()) {
                     var count = 0
                     for (srv in serverList.reversed()) {
                         val config = ServerConfig.create(EConfigType.CUSTOM)
                         config.fullConfig =
-                            Gson().fromJson(Gson().toJson(srv), V2rayConfig::class.java)
+                            JsonUtil.fromJson(JsonUtil.toJson(srv), V2rayConfig::class.java)
                         config.remarks = config.fullConfig?.remarks
                             ?: ("%04d-".format(count + 1) + System.currentTimeMillis()
                                 .toString())
                         config.subscriptionId = subid
                         val key = MmkvManager.encodeServerConfig("", config)
-                        serverRawStorage?.encode(key, gson.toJson(srv))
+                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv))
                         count += 1
                     }
                     return count
@@ -509,14 +301,31 @@ object AngConfigManager {
                 e.printStackTrace()
             }
 
-            // For compatibility
+            try {
-            val config = ServerConfig.create(EConfigType.CUSTOM)
+                // For compatibility
-            config.subscriptionId = subid
+                val config = ServerConfig.create(EConfigType.CUSTOM)
-            config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
+                config.subscriptionId = subid
-            config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
+                config.fullConfig = JsonUtil.fromJson(server, V2rayConfig::class.java)
-            val key = MmkvManager.encodeServerConfig("", config)
+                config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
-            serverRawStorage?.encode(key, server)
+                val key = MmkvManager.encodeServerConfig("", config)
-            return 1
+                MmkvManager.encodeServerRaw(key, server)
+                return 1
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            return 0
+        } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
+            try {
+                val config = WireguardFmt.parseWireguardConfFile(server)
+                    ?: return R.string.toast_incorrect_protocol
+                config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
+                val key = MmkvManager.encodeServerConfig("", config)
+                MmkvManager.encodeServerRaw(key, server)
+                return 1
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+            return 0
         } else {
             return 0
         }
@@ -535,7 +344,7 @@ object AngConfigManager {
         return count
     }
 
-    private fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
+    fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
         try {
             if (TextUtils.isEmpty(it.first)
                 || TextUtils.isEmpty(it.second.remarks)
@@ -551,19 +360,17 @@ object AngConfigManager {
                 return 0
             }
             Log.d(AppConfig.ANG_PACKAGE, url)
+
             var configText = try {
-                Utils.getUrlContentWithCustomUserAgent(url)
+                val httpPort = SettingsManager.getHttpPort()
+                Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
             } catch (e: Exception) {
                 e.printStackTrace()
                 ""
             }
             if (configText.isEmpty()) {
                 configText = try {
-                    val httpPort = Utils.parseInt(
+                    Utils.getUrlContentWithCustomUserAgent(url)
-                        settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT),
-                        AppConfig.PORT_HTTP.toInt()
-                    )
-                    Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
                 } catch (e: Exception) {
                     e.printStackTrace()
                     ""
@@ -589,4 +396,19 @@ object AngConfigManager {
         }
         return count
     }
+
+    private fun importUrlAsSubscription(url: String): Int {
+        val subscriptions = MmkvManager.decodeSubscriptions()
+        subscriptions.forEach {
+            if (it.second.url == url) {
+                return 0
+            }
+        }
+        val uri = URI(Utils.fixIllegalUrl(url))
+        val subItem = SubscriptionItem()
+        subItem.remarks = uri.fragment ?: "import sub"
+        subItem.url = url
+        MmkvManager.encodeSubscription("", subItem)
+        return 1
+    }
 }

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

@@ -1,21 +1,19 @@
 package com.v2ray.ang.util
 
-import android.Manifest
 import android.content.Context
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import com.v2ray.ang.dto.AppInfo
-import rx.Observable
+import io.reactivex.rxjava3.core.Observable
 
 object AppManagerUtil {
-    fun loadNetworkAppList(ctx: Context): ArrayList<AppInfo> {
+    private fun loadNetworkAppList(ctx: Context): ArrayList<AppInfo> {
         val packageManager = ctx.packageManager
         val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)
         val apps = ArrayList<AppInfo>()
 
         for (pkg in packages) {
-            if (!pkg.hasInternetPermission && pkg.packageName != "android") continue
+            //if (!pkg.hasInternetPermission && pkg.packageName != "android") continue
 
             val applicationInfo = pkg.applicationInfo
 
@@ -35,9 +33,9 @@ object AppManagerUtil {
             it.onNext(loadNetworkAppList(ctx))
         }
 
-    val PackageInfo.hasInternetPermission: Boolean
+//    val PackageInfo.hasInternetPermission: Boolean
-        get() {
+//        get() {
-            val permissions = requestedPermissions
+//            val permissions = requestedPermissions
-            return permissions?.any { it == Manifest.permission.INTERNET } ?: false
+//            return permissions?.any { it == Manifest.permission.INTERNET } ?: false
-        }
+//        }
 }

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

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

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

@@ -1,36 +1,63 @@
 package com.v2ray.ang.util
 
-import com.google.gson.Gson
+
 import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
+import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
 import com.v2ray.ang.dto.AssetUrlItem
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.SubscriptionItem
-import java.net.URI
 
 object MmkvManager {
-    const val ID_MAIN = "MAIN"
+
-    const val ID_SERVER_CONFIG = "SERVER_CONFIG"
+    //region private
-    const val ID_SERVER_RAW = "SERVER_RAW"
+
-    const val ID_SERVER_AFF = "SERVER_AFF"
+    private const val ID_MAIN = "MAIN"
-    const val ID_SUB = "SUB"
+    private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
-    const val ID_ASSET = "ASSET"
+    private const val ID_PROFILE_CONFIG = "PROFILE_CONFIG"
-    const val ID_SETTING = "SETTING"
+    private const val ID_SERVER_RAW = "SERVER_RAW"
-    const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
+    private const val ID_SERVER_AFF = "SERVER_AFF"
-    const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
+    private const val ID_SUB = "SUB"
+    private const val ID_ASSET = "ASSET"
+    private const val ID_SETTING = "SETTING"
+    private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
+    private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
+    private const val KEY_SUB_IDS = "SUB_IDS"
 
     private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
+    val settingsStorage by lazy { MMKV.mmkvWithID(ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
     private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
+    private val profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
     private val serverAffStorage by lazy { MMKV.mmkvWithID(ID_SERVER_AFF, MMKV.MULTI_PROCESS_MODE) }
     private val subStorage by lazy { MMKV.mmkvWithID(ID_SUB, MMKV.MULTI_PROCESS_MODE) }
     private val assetStorage by lazy { MMKV.mmkvWithID(ID_ASSET, MMKV.MULTI_PROCESS_MODE) }
+    private val serverRawStorage by lazy { MMKV.mmkvWithID(ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
+
+    //endregion
+
+    //region Server
+
+    fun getSelectServer(): String? {
+        return mainStorage.decodeString(KEY_SELECTED_SERVER)
+    }
+
+    fun setSelectServer(guid: String) {
+        mainStorage.encode(KEY_SELECTED_SERVER, guid)
+    }
+
+    fun encodeServerList(serverList: MutableList<String>) {
+        mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
+    }
 
     fun decodeServerList(): MutableList<String> {
-        val json = mainStorage?.decodeString(KEY_ANG_CONFIGS)
+        val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            Gson().fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
         }
     }
 
@@ -38,24 +65,43 @@ object MmkvManager {
         if (guid.isBlank()) {
             return null
         }
-        val json = serverStorage?.decodeString(guid)
+        val json = serverStorage.decodeString(guid)
         if (json.isNullOrBlank()) {
             return null
         }
-        return Gson().fromJson(json, ServerConfig::class.java)
+        return JsonUtil.fromJson(json, ServerConfig::class.java)
+    }
+
+    fun decodeProfileConfig(guid: String): ProfileItem? {
+        if (guid.isBlank()) {
+            return null
+        }
+        val json = profileStorage.decodeString(guid)
+        if (json.isNullOrBlank()) {
+            return null
+        }
+        return JsonUtil.fromJson(json, ProfileItem::class.java)
     }
 
     fun encodeServerConfig(guid: String, config: ServerConfig): String {
         val key = guid.ifBlank { Utils.getUuid() }
-        serverStorage?.encode(key, Gson().toJson(config))
+        serverStorage.encode(key, JsonUtil.toJson(config))
         val serverList = decodeServerList()
         if (!serverList.contains(key)) {
             serverList.add(0, key)
-            mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
+            encodeServerList(serverList)
-            if (mainStorage?.decodeString(KEY_SELECTED_SERVER).isNullOrBlank()) {
+            if (getSelectServer().isNullOrBlank()) {
-                mainStorage?.encode(KEY_SELECTED_SERVER, key)
+                mainStorage.encode(KEY_SELECTED_SERVER, key)
             }
         }
+        val profile = ProfileItem(
+            configType = config.configType,
+            subscriptionId = config.subscriptionId,
+            remarks = config.remarks,
+            server = config.getProxyOutbound()?.getServerAddress(),
+            serverPort = config.getProxyOutbound()?.getServerPort(),
+        )
+        profileStorage.encode(key, JsonUtil.toJson(profile))
         return key
     }
 
@@ -63,21 +109,22 @@ object MmkvManager {
         if (guid.isBlank()) {
             return
         }
-        if (mainStorage?.decodeString(KEY_SELECTED_SERVER) == guid) {
+        if (getSelectServer() == guid) {
-            mainStorage?.remove(KEY_SELECTED_SERVER)
+            mainStorage.remove(KEY_SELECTED_SERVER)
         }
         val serverList = decodeServerList()
         serverList.remove(guid)
-        mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
+        encodeServerList(serverList)
-        serverStorage?.remove(guid)
+        serverStorage.remove(guid)
-        serverAffStorage?.remove(guid)
+        profileStorage.remove(guid)
+        serverAffStorage.remove(guid)
     }
 
     fun removeServerViaSubid(subid: String) {
         if (subid.isBlank()) {
             return
         }
-        serverStorage?.allKeys()?.forEach { key ->
+        serverStorage.allKeys()?.forEach { key ->
             decodeServerConfig(key)?.let { config ->
                 if (config.subscriptionId == subid) {
                     removeServer(key)
@@ -90,11 +137,11 @@ object MmkvManager {
         if (guid.isBlank()) {
             return null
         }
-        val json = serverAffStorage?.decodeString(guid)
+        val json = serverAffStorage.decodeString(guid)
         if (json.isNullOrBlank()) {
             return null
         }
-        return Gson().fromJson(json, ServerAffiliationInfo::class.java)
+        return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
     }
 
     fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
@@ -103,98 +150,175 @@ object MmkvManager {
         }
         val aff = decodeServerAffiliationInfo(guid) ?: ServerAffiliationInfo()
         aff.testDelayMillis = testResult
-        serverAffStorage?.encode(guid, Gson().toJson(aff))
+        serverAffStorage.encode(guid, JsonUtil.toJson(aff))
     }
 
     fun clearAllTestDelayResults(keys: List<String>?) {
         keys?.forEach { key ->
             decodeServerAffiliationInfo(key)?.let { aff ->
                 aff.testDelayMillis = 0
-                serverAffStorage?.encode(key, Gson().toJson(aff))
+                serverAffStorage.encode(key, JsonUtil.toJson(aff))
             }
         }
     }
 
-    fun importUrlAsSubscription(url: String): Int {
-        val subscriptions = decodeSubscriptions()
-        subscriptions.forEach {
-            if (it.second.url == url) {
-                return 0
-            }
-        }
-        val uri = URI(Utils.fixIllegalUrl(url))
-        val subItem = SubscriptionItem()
-        subItem.remarks = Utils.urlDecode(uri.fragment ?: "import sub")
-        subItem.url = url
-        subStorage?.encode(Utils.getUuid(), Gson().toJson(subItem))
-        return 1
-    }
-
-    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
-        val subscriptions = mutableListOf<Pair<String, SubscriptionItem>>()
-        subStorage?.allKeys()?.forEach { key ->
-            val json = subStorage?.decodeString(key)
-            if (!json.isNullOrBlank()) {
-                subscriptions.add(Pair(key, Gson().fromJson(json, SubscriptionItem::class.java)))
-            }
-        }
-        subscriptions.sortedBy { (_, value) -> value.addedTime }
-        return subscriptions
-    }
-
-    fun removeSubscription(subid: String) {
-        subStorage?.remove(subid)
-        removeServerViaSubid(subid)
-    }
-
-    fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
-        val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
-        assetStorage?.allKeys()?.forEach { key ->
-            val json = assetStorage?.decodeString(key)
-            if (!json.isNullOrBlank()) {
-                assetUrlItems.add(Pair(key, Gson().fromJson(json, AssetUrlItem::class.java)))
-            }
-        }
-        assetUrlItems.sortedBy { (_, value) -> value.addedTime }
-        return assetUrlItems
-    }
-
-    fun removeAssetUrl(assetid: String) {
-        assetStorage?.remove(assetid)
-    }
-
     fun removeAllServer() {
-        mainStorage?.clearAll()
+        mainStorage.clearAll()
-        serverStorage?.clearAll()
+        serverStorage.clearAll()
-        serverAffStorage?.clearAll()
+        profileStorage.clearAll()
+        serverAffStorage.clearAll()
     }
 
-    fun removeInvalidServer() {
+    fun removeInvalidServer(guid: String) {
-        serverAffStorage?.allKeys()?.forEach { key ->
+        if (guid.isNotEmpty()) {
-            decodeServerAffiliationInfo(key)?.let { aff ->
+            decodeServerAffiliationInfo(guid)?.let { aff ->
                 if (aff.testDelayMillis < 0L) {
-                    removeServer(key)
+                    removeServer(guid)
+                }
+            }
+        } else {
+            serverAffStorage.allKeys()?.forEach { key ->
+                decodeServerAffiliationInfo(key)?.let { aff ->
+                    if (aff.testDelayMillis < 0L) {
+                        removeServer(key)
+                    }
                 }
             }
         }
     }
 
-    fun sortByTestResults() {
+    fun encodeServerRaw(guid: String, config: String) {
-        data class ServerDelay(var guid: String, var testDelayMillis: Long)
+        serverRawStorage.encode(guid, config)
-
-        val serverDelays = mutableListOf<ServerDelay>()
-        val serverList = decodeServerList()
-        serverList.forEach { key ->
-            val delay = decodeServerAffiliationInfo(key)?.testDelayMillis ?: 0L
-            serverDelays.add(ServerDelay(key, if (delay <= 0L) 999999 else delay))
-        }
-        serverDelays.sortBy { it.testDelayMillis }
-
-        serverDelays.forEach {
-            serverList.remove(it.guid)
-            serverList.add(it.guid)
-        }
-
-        mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
     }
+
+    fun decodeServerRaw(guid: String): String? {
+        return serverRawStorage.decodeString(guid) ?: return null
+    }
+
+    //endregion
+
+    //region Subscriptions
+
+    private fun initSubsList() {
+        val subsList = decodeSubsList()
+        if (subsList.isNotEmpty()) {
+            return
+        }
+        subStorage.allKeys()?.forEach { key ->
+            subsList.add(key)
+        }
+        encodeSubsList(subsList)
+    }
+
+    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
+        initSubsList()
+
+        val subscriptions = mutableListOf<Pair<String, SubscriptionItem>>()
+        decodeSubsList().forEach { key ->
+            val json = subStorage.decodeString(key)
+            if (!json.isNullOrBlank()) {
+                subscriptions.add(Pair(key, JsonUtil.fromJson(json, SubscriptionItem::class.java)))
+            }
+        }
+        return subscriptions
+    }
+
+    fun removeSubscription(subid: String) {
+        subStorage.remove(subid)
+        val subsList = decodeSubsList()
+        subsList.remove(subid)
+        encodeSubsList(subsList)
+
+        removeServerViaSubid(subid)
+    }
+
+    fun encodeSubscription(guid: String, subItem: SubscriptionItem) {
+        val key = guid.ifBlank { Utils.getUuid() }
+        subStorage.encode(key, JsonUtil.toJson(subItem))
+
+        val subsList = decodeSubsList()
+        if (!subsList.contains(key)) {
+            subsList.add(key)
+            encodeSubsList(subsList)
+        }
+    }
+
+    fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
+        val json = subStorage.decodeString(subscriptionId) ?: return null
+        return JsonUtil.fromJson(json, SubscriptionItem::class.java)
+    }
+
+    fun encodeSubsList(subsList: MutableList<String>) {
+        mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList))
+    }
+
+    fun decodeSubsList(): MutableList<String> {
+        val json = mainStorage.decodeString(KEY_SUB_IDS)
+        return if (json.isNullOrBlank()) {
+            mutableListOf()
+        } else {
+            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+        }
+    }
+
+    //endregion
+
+    //region Asset
+
+    fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
+        val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
+        assetStorage.allKeys()?.forEach { key ->
+            val json = assetStorage.decodeString(key)
+            if (!json.isNullOrBlank()) {
+                assetUrlItems.add(Pair(key, JsonUtil.fromJson(json, AssetUrlItem::class.java)))
+            }
+        }
+        return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
+    }
+
+    fun removeAssetUrl(assetid: String) {
+        assetStorage.remove(assetid)
+    }
+
+    fun encodeAsset(assetid: String, assetItem: AssetUrlItem) {
+        val key = assetid.ifBlank { Utils.getUuid() }
+        assetStorage.encode(key, JsonUtil.toJson(assetItem))
+    }
+
+    fun decodeAsset(assetid: String): AssetUrlItem? {
+        val json = assetStorage.decodeString(assetid) ?: return null
+        return JsonUtil.fromJson(json, AssetUrlItem::class.java)
+    }
+
+    //endregion
+
+    //region Routing
+
+    fun decodeRoutingRulesets(): MutableList<RulesetItem>? {
+        val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET)
+        if (ruleset.isNullOrEmpty()) return null
+        return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
+    }
+
+    fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
+        if (rulesetList.isNullOrEmpty())
+            settingsStorage.encode(PREF_ROUTING_RULESET, "")
+        else
+            settingsStorage.encode(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
+    }
+
+    //endregion
+
+    //region Others
+
+    fun encodeStartOnBoot(startOnBoot: Boolean) {
+        settingsStorage.encode(PREF_IS_BOOTED, startOnBoot)
+    }
+
+    fun decodeStartOnBoot(): Boolean {
+        return settingsStorage.decodeBool(PREF_IS_BOOTED, false)
+    }
+
+    //endregion
+
 }

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

@@ -0,0 +1,99 @@
+package com.v2ray.ang.util
+
+import android.content.Context
+import android.os.SystemClock
+import android.util.Log
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ServerConfig
+import com.v2ray.ang.service.ProcessService
+import com.v2ray.ang.util.fmt.Hysteria2Fmt
+import java.io.File
+
+object PluginUtil {
+    //private const val HYSTERIA2 = "hysteria2-plugin"
+    private const val HYSTERIA2 = "libhysteria2.so"
+    private const val TAG = ANG_PACKAGE
+    private lateinit var procService: ProcessService
+
+//    fun initPlugin(name: String): PluginManager.InitResult {
+//        return PluginManager.init(name)!!
+//    }
+
+    fun runPlugin(context: Context, config: ServerConfig?, domainPort: String?) {
+        Log.d(TAG, "runPlugin")
+
+        val outbound = config?.getProxyOutbound() ?: return
+        if (outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)) {
+            val configFile = genConfigHy2(context, config, domainPort) ?: return
+            val cmd = genCmdHy2(context, configFile)
+
+            procService = ProcessService()
+            procService.runProcess(context, cmd)
+        }
+    }
+
+    fun stopPlugin() {
+        stopHy2()
+    }
+
+    fun realPingHy2(context: Context, config: ServerConfig?): Long {
+        Log.d(TAG, "realPingHy2")
+        val retFailure = -1L
+
+        val outbound = config?.getProxyOutbound() ?: return retFailure
+        if (outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)) {
+            val socksPort = Utils.findFreePort(listOf(0))
+            val configFile = genConfigHy2(context, config, "0:${socksPort}") ?: return retFailure
+            val cmd = genCmdHy2(context, configFile)
+
+            val proc = ProcessService()
+            proc.runProcess(context, cmd)
+            Thread.sleep(1000L)
+            val delay = SpeedtestUtil.testConnection(context, socksPort)
+            proc.stopProcess()
+
+            return delay.first
+        }
+        return retFailure
+    }
+
+    private fun genConfigHy2(context: Context, config: ServerConfig, domainPort: String?): File? {
+        Log.d(TAG, "runPlugin $HYSTERIA2")
+
+        val socksPort = domainPort?.split(":")?.last()
+            .let { if (it.isNullOrEmpty()) return null else it.toInt() }
+        val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return null
+
+        val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
+        Log.d(TAG, "runPlugin ${configFile.absolutePath}")
+
+        configFile.parentFile?.mkdirs()
+        configFile.writeText(JsonUtil.toJson(hy2Config))
+        Log.d(TAG, JsonUtil.toJson(hy2Config))
+
+        return configFile
+    }
+
+    private fun genCmdHy2(context: Context, configFile: File): MutableList<String> {
+        return mutableListOf(
+            File(context.applicationInfo.nativeLibraryDir, HYSTERIA2).absolutePath,
+            //initPlugin(HYSTERIA2).path,
+            "--disable-update-check",
+            "--config",
+            configFile.absolutePath,
+            "--log-level",
+            "warn",
+            "client"
+        )
+    }
+
+    private fun stopHy2() {
+        try {
+            Log.d(TAG, "$HYSTERIA2 destroy")
+            procService?.stopProcess()
+        } catch (e: Exception) {
+            Log.d(TAG, e.toString())
+        }
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.v2ray.ang.util
+
+import android.content.Context
+import android.text.TextUtils
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
+import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
+import com.v2ray.ang.AppConfig.TAG_DIRECT
+import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.dto.ServerConfig
+import com.v2ray.ang.util.MmkvManager.decodeProfileConfig
+import com.v2ray.ang.util.MmkvManager.decodeServerConfig
+import com.v2ray.ang.util.MmkvManager.decodeServerList
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.Utils.parseInt
+import java.util.Collections
+
+object SettingsManager {
+
+    fun initRoutingRulesets(context: Context) {
+        val exist = MmkvManager.decodeRoutingRulesets()
+        if (exist.isNullOrEmpty()) {
+            val rulesetList = getPresetRoutingRulesets(context)
+            MmkvManager.encodeRoutingRulesets(rulesetList)
+        }
+    }
+
+    private fun getPresetRoutingRulesets(context: Context, index: Int = 0): MutableList<RulesetItem>? {
+        val fileName = when (index) {
+            0 -> "custom_routing_white"
+            1 -> "custom_routing_black"
+            2 -> "custom_routing_global"
+            3 -> "custom_routing_white_iran"
+            else -> "custom_routing_white"
+        }
+        val assets = Utils.readTextFromAssets(context, fileName)
+        if (TextUtils.isEmpty(assets)) {
+            return null
+        }
+
+        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
+    }
+
+    fun resetRoutingRulesets(context: Context, index: Int) {
+        val rulesetList = getPresetRoutingRulesets(context, index) ?: return
+        resetRoutingRulesetsCommon(rulesetList)
+    }
+
+    fun resetRoutingRulesetsFromClipboard(content: String?): Boolean {
+        if (content.isNullOrEmpty()) {
+            return false
+        }
+
+        try {
+            val rulesetList = JsonUtil.fromJson(content, Array<RulesetItem>::class.java).toMutableList()
+            if (rulesetList.isNullOrEmpty()) {
+                return false
+            }
+
+            resetRoutingRulesetsCommon(rulesetList)
+            return true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+    }
+
+    private fun resetRoutingRulesetsCommon(rulesetList: MutableList<RulesetItem>) {
+        val rulesetNew: MutableList<RulesetItem> = mutableListOf()
+        MmkvManager.decodeRoutingRulesets()?.forEach { key ->
+            if (key.looked == true) {
+                rulesetNew.add(key)
+            }
+        }
+
+        rulesetNew.addAll(rulesetList)
+        MmkvManager.encodeRoutingRulesets(rulesetNew)
+    }
+
+    fun getRoutingRuleset(index: Int): RulesetItem? {
+        if (index < 0) return null
+
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) return null
+
+        return rulesetList[index]
+    }
+
+    fun saveRoutingRuleset(index: Int, ruleset: RulesetItem?) {
+        if (ruleset == null) return
+
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) return
+
+        if (index < 0 || index >= rulesetList.count()) {
+            rulesetList.add(ruleset)
+        } else {
+            rulesetList[index] = ruleset
+        }
+        MmkvManager.encodeRoutingRulesets(rulesetList)
+    }
+
+    fun removeRoutingRuleset(index: Int) {
+        if (index < 0) return
+
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) return
+
+        rulesetList.removeAt(index)
+        MmkvManager.encodeRoutingRulesets(rulesetList)
+    }
+
+    fun routingRulesetsBypassLan(): Boolean {
+        val rulesetItems = MmkvManager.decodeRoutingRulesets()
+        val exist = rulesetItems?.filter { it.enabled && it.outboundTag == TAG_DIRECT }?.any {
+            it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
+        }
+        return exist == true
+    }
+
+    fun swapRoutingRuleset(fromPosition: Int, toPosition: Int) {
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) return
+
+        Collections.swap(rulesetList, fromPosition, toPosition)
+        MmkvManager.encodeRoutingRulesets(rulesetList)
+    }
+
+    fun swapSubscriptions(fromPosition: Int, toPosition: Int) {
+        val subsList = MmkvManager.decodeSubsList()
+        if (subsList.isNullOrEmpty()) return
+
+        Collections.swap(subsList, fromPosition, toPosition)
+        MmkvManager.encodeSubsList(subsList)
+    }
+
+    fun getServerViaRemarks(remarks: String?): ServerConfig? {
+        if (remarks == null) {
+            return null
+        }
+        val serverList = decodeServerList()
+        for (guid in serverList) {
+            val profile = decodeProfileConfig(guid)
+            if (profile != null && profile.remarks == remarks) {
+                return decodeServerConfig(guid)
+            }
+        }
+        return null
+    }
+
+    fun getSocksPort(): Int {
+        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+    }
+
+    fun getHttpPort(): Int {
+        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+    }
+
+}

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

@@ -5,6 +5,7 @@ import android.os.SystemClock
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.responseLength
 import kotlinx.coroutines.isActive
@@ -97,9 +98,9 @@ object SpeedtestUtil {
         }
     }
 
-    fun testConnection(context: Context, port: Int): String {
+    fun testConnection(context: Context, port: Int): Pair<Long, String> {
-        // return V2RayVpnService.measureV2rayDelay()
         var result: String
+        var elapsed = -1L
         var conn: HttpURLConnection? = null
 
         try {
@@ -108,7 +109,7 @@ object SpeedtestUtil {
             conn = url.openConnection(
                 Proxy(
                     Proxy.Type.HTTP,
-                    InetSocketAddress("127.0.0.1", port)
+                    InetSocketAddress(LOOPBACK, port)
                 )
             ) as HttpURLConnection
             conn.connectTimeout = 30000
@@ -119,7 +120,7 @@ object SpeedtestUtil {
 
             val start = SystemClock.elapsedRealtime()
             val code = conn.responseCode
-            val elapsed = SystemClock.elapsedRealtime() - start
+            elapsed = SystemClock.elapsedRealtime() - start
 
             if (code == 204 || code == 200 && conn.responseLength == 0L) {
                 result = context.getString(R.string.connection_test_available, elapsed)
@@ -133,10 +134,7 @@ object SpeedtestUtil {
             }
         } catch (e: IOException) {
             // network exception
-            Log.d(
+            Log.d(AppConfig.ANG_PACKAGE, "testConnection IOException: " + Log.getStackTraceString(e))
-                AppConfig.ANG_PACKAGE,
-                "testConnection IOException: " + Log.getStackTraceString(e)
-            )
             result = context.getString(R.string.connection_test_error, e.message)
         } catch (e: Exception) {
             // library exception, eg sumsung
@@ -146,7 +144,7 @@ object SpeedtestUtil {
             conn?.disconnect()
         }
 
-        return result
+        return Pair(elapsed, result)
     }
 
     fun getLibVersion(): String {

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

@@ -17,22 +17,20 @@ import android.util.Log
 import android.util.Patterns
 import android.webkit.URLUtil
 import androidx.appcompat.app.AppCompatDelegate
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import java.io.IOException
 import java.net.*
 import java.util.*
 
 object Utils {
 
-    private val mainStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
-
     /**
      * convert string to editalbe for kotlin
      *
@@ -40,7 +38,7 @@ object Utils {
      * @return
      */
     fun getEditable(text: String?): Editable {
-        return Editable.Factory.getInstance().newEditable(text?:"")
+        return Editable.Factory.getInstance().newEditable(text.orEmpty())
     }
 
     /**
@@ -63,15 +61,10 @@ object Utils {
     }
 
     fun parseInt(str: String?, default: Int): Int {
-        str ?: return default
+        return str?.toIntOrNull() ?: default
-        return try {
-            Integer.parseInt(str)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            default
-        }
     }
 
+
     /**
      * get text from clipboard
      */
@@ -102,22 +95,18 @@ object Utils {
      * base64 decode
      */
     fun decode(text: String?): String {
-        tryDecodeBase64(text)?.let { return it }
+        return tryDecodeBase64(text) ?: text?.trimEnd('=')?.let { tryDecodeBase64(it) }.orEmpty()
-        if (text?.endsWith('=')==true) {
-            // try again for some loosely formatted base64
-            tryDecodeBase64(text.trimEnd('='))?.let { return it }
-        }
-        return ""
     }
 
+
     fun tryDecodeBase64(text: String?): String? {
         try {
-            return Base64.decode(text, Base64.NO_WRAP).toString(charset("UTF-8"))
+            return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8)
         } catch (e: Exception) {
             Log.i(ANG_PACKAGE, "Parse base64 standard failed $e")
         }
         try {
-            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(charset("UTF-8"))
+            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(Charsets.UTF_8)
         } catch (e: Exception) {
             Log.i(ANG_PACKAGE, "Parse base64 url safe failed $e")
         }
@@ -129,7 +118,7 @@ object Utils {
      */
     fun encode(text: String): String {
         return try {
-            Base64.encodeToString(text.toByteArray(charset("UTF-8")), Base64.NO_WRAP)
+            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
         } catch (e: Exception) {
             e.printStackTrace()
             ""
@@ -149,7 +138,7 @@ object Utils {
     }
 
     fun getVpnDnsServers(): List<String> {
-        val vpnDns = settingsStorage?.decodeString(AppConfig.PREF_VPN_DNS)?:AppConfig.DNS_VPN
+        val vpnDns = settingsStorage?.decodeString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
         return vpnDns.split(",").filter { isPureIpAddress(it) }
         // allow empty, in that case dns will use system default
     }
@@ -213,7 +202,8 @@ object Utils {
     }
 
     fun isIpv4Address(value: String): Boolean {
-        val regV4 = Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
+        val regV4 =
+            Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
         return regV4.matches(value)
     }
 
@@ -223,12 +213,13 @@ object Utils {
             addr = addr.drop(1)
             addr = addr.dropLast(addr.count() - addr.lastIndexOf("]"))
         }
-        val regV6 = Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$")
+        val regV6 =
+            Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$")
         return regV6.matches(addr)
     }
 
     private fun isCoreDNSAddress(s: String): Boolean {
-        return s.startsWith("https") || s.startsWith("tcp") || s.startsWith("quic")
+        return s.startsWith("https") || s.startsWith("tcp") || s.startsWith("quic") || s == "localhost"
     }
 
     /**
@@ -236,7 +227,13 @@ object Utils {
      */
     fun isValidUrl(value: String?): Boolean {
         try {
-            if (value != null && Patterns.WEB_URL.matcher(value).matches() || URLUtil.isValidUrl(value)) {
+            if (value.isNullOrEmpty()) {
+                return false
+            }
+            if (Patterns.WEB_URL.matcher(value).matches()
+                || Patterns.DOMAIN_NAME.matcher(value).matches()
+                || URLUtil.isValidUrl(value)
+            ) {
                 return true
             }
         } catch (e: Exception) {
@@ -247,7 +244,7 @@ object Utils {
     }
 
     fun startVServiceFromToggle(context: Context): Boolean {
-        if (mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) {
+        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
             context.toast(R.string.app_tile_first_use)
             return false
         }
@@ -282,7 +279,7 @@ object Utils {
 
     fun urlDecode(url: String): String {
         return try {
-            URLDecoder.decode(url, "UTF-8")
+            URLDecoder.decode(url, Charsets.UTF_8.toString())
         } catch (e: Exception) {
             e.printStackTrace()
             url
@@ -291,7 +288,7 @@ object Utils {
 
     fun urlEncode(url: String): String {
         return try {
-            URLEncoder.encode(url, "UTF-8")
+            URLEncoder.encode(url, Charsets.UTF_8.toString())
         } catch (e: Exception) {
             e.printStackTrace()
             url
@@ -303,8 +300,7 @@ object Utils {
      * readTextFromAssets
      */
     fun readTextFromAssets(context: Context?, fileName: String): String {
-        if(context == null)
+        if (context == null) {
-        {
             return ""
         }
         val content = context.assets.open(fileName).bufferedReader().use {
@@ -317,7 +313,7 @@ object Utils {
         if (context == null)
             return ""
         val extDir = context.getExternalFilesDir(AppConfig.DIR_ASSETS)
-                ?: return context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath
+            ?: return context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath
         return extDir.absolutePath
     }
 
@@ -330,7 +326,7 @@ object Utils {
     }
 
     fun getDeviceIdForXUDPBaseKey(): String {
-        val androidId = Settings.Secure.ANDROID_ID.toByteArray(charset("UTF-8"))
+        val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
         return Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
     }
 
@@ -364,7 +360,7 @@ object Utils {
             url.openConnection(
                 Proxy(
                     Proxy.Type.HTTP,
-                    InetSocketAddress("127.0.0.1", httpPort)
+                    InetSocketAddress(LOOPBACK, httpPort)
                 )
             )
         }
@@ -373,8 +369,10 @@ object Utils {
         conn.setRequestProperty("Connection", "close")
         conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
         url.userInfo?.let {
-            conn.setRequestProperty("Authorization",
+            conn.setRequestProperty(
-                "Basic ${encode(urlDecode(it))}")
+                "Authorization",
+                "Basic ${encode(urlDecode(it))}"
+            )
         }
         conn.useCaches = false
         return conn.inputStream.use {
@@ -383,10 +381,10 @@ object Utils {
     }
 
     fun getDarkModeStatus(context: Context): Boolean {
-        val mode = context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK
+        return context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK != UI_MODE_NIGHT_NO
-        return mode != UI_MODE_NIGHT_NO
     }
 
+
     fun setNightMode(context: Context) {
         when (settingsStorage?.decodeString(AppConfig.PREF_UI_MODE_NIGHT, "0")) {
             "0" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
@@ -396,7 +394,7 @@ object Utils {
     }
 
     fun getIpv6Address(address: String?): String {
-        if(address == null){
+        if (address == null) {
             return ""
         }
         return if (isIpv6Address(address) && !address.contains('[') && !address.contains(']')) {
@@ -406,17 +404,21 @@ object Utils {
         }
     }
 
-    fun getLocale(context: Context): Locale =
+    fun getLocale(): Locale {
-        when (settingsStorage?.decodeString(AppConfig.PREF_LANGUAGE) ?: "auto") {
+        val lang = settingsStorage?.decodeString(AppConfig.PREF_LANGUAGE) ?: "auto"
-            "auto" ->  getSysLocale()
+        return when (lang) {
-            "en" -> Locale("en")
+            "auto" -> getSysLocale()
-            "zh-rCN" -> Locale("zh", "CN")
+            "en" -> Locale.ENGLISH
-            "zh-rTW" -> Locale("zh", "TW")
+            "zh-rCN" -> Locale.CHINA
+            "zh-rTW" -> Locale.TRADITIONAL_CHINESE
             "vi" -> Locale("vi")
             "ru" -> Locale("ru")
             "fa" -> Locale("fa")
+            "bn" -> Locale("bn")
             else -> getSysLocale()
         }
+    }
+
 
     private fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         LocaleList.getDefault()[0]
@@ -426,8 +428,8 @@ object Utils {
 
     fun fixIllegalUrl(str: String): String {
         return str
-            .replace(" ","%20")
+            .replace(" ", "%20")
-            .replace("|","%7C")
+            .replace("|", "%7C")
     }
 
     fun removeWhiteSpace(str: String?): String? {
@@ -443,18 +445,25 @@ object Utils {
     fun isTv(context: Context): Boolean =
         context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
 
-    fun getDelayTestUrl(): String {
-        val url = settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL)
-        return if (url.isNullOrEmpty()) AppConfig.DelayTestUrl else url
-    }
-
     fun getDelayTestUrl(second: Boolean = false): String {
         return if (second) {
             AppConfig.DelayTestUrl2
         } else {
-            val url = settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL)
+            settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DelayTestUrl
-            if (url.isNullOrEmpty()) AppConfig.DelayTestUrl else url
         }
     }
+
+    fun findFreePort(ports: List<Int>): Int {
+        for (port in ports) {
+            try {
+                return ServerSocket(port).use { it.localPort }
+            } catch (ex: IOException) {
+                continue  // try next port
+            }
+        }
+
+        // if the program gets here, no port in the range was found
+        throw IOException("no free port found")
+    }
 }
 

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

@@ -3,96 +3,83 @@ package com.v2ray.ang.util
 import android.content.Context
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.GEOIP_CN
+import com.v2ray.ang.AppConfig.GEOSITE_CN
+import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.PROTOCOL_FREEDOM
+import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.TAG_FRAGMENT
+import com.v2ray.ang.AppConfig.TAG_PROXY
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
+import com.v2ray.ang.dto.ConfigResult
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ERoutingMode
+import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_NETWORK
 import com.v2ray.ang.dto.V2rayConfig.Companion.HTTP
+import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 
 object V2rayConfigUtil {
-    private val serverRawStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SERVER_RAW,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
 
-    data class Result(var status: Boolean, var content: String)
+    fun getV2rayConfig(context: Context, guid: String): ConfigResult {
-
-    /**
-     * 生成v2ray的客户端配置文件
-     */
-    fun getV2rayConfig(context: Context, guid: String): Result {
         try {
-            val config = MmkvManager.decodeServerConfig(guid) ?: return Result(false, "")
+            val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
             if (config.configType == EConfigType.CUSTOM) {
-                val raw = serverRawStorage?.decodeString(guid)
+                val raw = MmkvManager.decodeServerRaw(guid)
                 val customConfig = if (raw.isNullOrBlank()) {
-                    config.fullConfig?.toPrettyPrinting() ?: return Result(false, "")
+                    config.fullConfig?.toPrettyPrinting() ?: return ConfigResult(false)
                 } else {
                     raw
                 }
-                //Log.d(ANG_PACKAGE, customConfig)
+                val domainPort = config.getProxyOutbound()?.getServerAddressAndPort()
-                return Result(true, customConfig)
+                return ConfigResult(true, guid, customConfig, domainPort)
-            }
-            val outbound = config.getProxyOutbound() ?: return Result(false, "")
-            val address = outbound.getServerAddress() ?: return Result(false, "")
-            if (!Utils.isIpAddress(address) && !Utils.isValidUrl(address)) {
-                Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
-                return Result(false, "")
             }
 
-            val result = getV2rayNonCustomConfig(context, outbound, config.remarks)
+            val result = getV2rayNonCustomConfig(context, config)
             //Log.d(ANG_PACKAGE, result.content)
+            result.guid = guid
             return result
         } catch (e: Exception) {
             e.printStackTrace()
-            return Result(false, "")
+            return ConfigResult(false)
         }
     }
 
-    /**
+    private fun getV2rayNonCustomConfig(context: Context, config: ServerConfig): ConfigResult {
-     * 生成v2ray的客户端配置文件
+        val result = ConfigResult(false)
-     */
+
-    private fun getV2rayNonCustomConfig(
+        val outbound = config.getProxyOutbound() ?: return result
-        context: Context,
+        val address = outbound.getServerAddress() ?: return result
-        outbound: V2rayConfig.OutboundBean,
+        if (!Utils.isIpAddress(address)) {
-        remarks: String,
+            if (!Utils.isValidUrl(address)) {
-    ): Result {
+                Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
-        val result = Result(false, "")
+                return result
+            }
+        }
+
         //取得默认配置
         val assets = Utils.readTextFromAssets(context, "v2ray_config.json")
         if (TextUtils.isEmpty(assets)) {
             return result
         }
-
+        val v2rayConfig = JsonUtil.fromJson(assets, V2rayConfig::class.java) ?: return result
-        //转成Json
+        v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL) ?: "warning"
-        val v2rayConfig = Gson().fromJson(assets, V2rayConfig::class.java) ?: return result
+        v2rayConfig.remarks = config.remarks
-
-        v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL)
-            ?: "warning"
 
         inbounds(v2rayConfig)
 
-        updateOutboundWithGlobalSettings(outbound)
+        val isPlugin = outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)
-        v2rayConfig.outbounds[0] = outbound
+        val retOut = outbounds(v2rayConfig, outbound, isPlugin)
 
-        updateOutboundFragment(v2rayConfig)
+        val retMore = moreOutbounds(v2rayConfig, config.subscriptionId, isPlugin)
 
         routing(v2rayConfig)
 
@@ -108,31 +95,21 @@ object V2rayConfigUtil {
             v2rayConfig.policy = null
         }
 
-        v2rayConfig.remarks = remarks
-
         result.status = true
         result.content = v2rayConfig.toPrettyPrinting()
+        result.domainPort = if (retMore.first) retMore.second else retOut.second
         return result
     }
 
-    /**
-     *
-     */
     private fun inbounds(v2rayConfig: V2rayConfig): Boolean {
         try {
-            val socksPort = Utils.parseInt(
+            val socksPort = SettingsManager.getSocksPort()
-                settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT),
+            val httpPort = SettingsManager.getHttpPort()
-                AppConfig.PORT_SOCKS.toInt()
-            )
-            val httpPort = Utils.parseInt(
-                settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT),
-                AppConfig.PORT_HTTP.toInt()
-            )
 
             v2rayConfig.inbounds.forEach { curInbound ->
                 if (settingsStorage?.decodeBool(AppConfig.PREF_PROXY_SHARING) != true) {
                     //bind all inbounds to localhost if the user requests
-                    curInbound.listen = "127.0.0.1"
+                    curInbound.listen = LOOPBACK
                 }
             }
             v2rayConfig.inbounds[0].port = socksPort
@@ -166,85 +143,59 @@ object V2rayConfigUtil {
         return true
     }
 
+    private fun outbounds(v2rayConfig: V2rayConfig, outbound: V2rayConfig.OutboundBean, isPlugin: Boolean): Pair<Boolean, String> {
+        if (isPlugin) {
+            val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
+            val outboundNew = V2rayConfig.OutboundBean(
+                mux = null,
+                protocol = EConfigType.SOCKS.name.lowercase(),
+                settings = V2rayConfig.OutboundBean.OutSettingsBean(
+                    servers = listOf(
+                        V2rayConfig.OutboundBean.OutSettingsBean.ServersBean(
+                            address = LOOPBACK,
+                            port = socksPort
+                        )
+                    )
+                )
+            )
+            if (v2rayConfig.outbounds.isNotEmpty()) {
+                v2rayConfig.outbounds[0] = outboundNew
+            } else {
+                v2rayConfig.outbounds.add(outboundNew)
+            }
+            return Pair(true, outboundNew.getServerAddressAndPort())
+        }
+
+        val ret = updateOutboundWithGlobalSettings(outbound)
+        if (!ret) return Pair(false, "")
+
+        if (v2rayConfig.outbounds.isNotEmpty()) {
+            v2rayConfig.outbounds[0] = outbound
+        } else {
+            v2rayConfig.outbounds.add(outbound)
+        }
+
+        updateOutboundFragment(v2rayConfig)
+        return Pair(true, outbound.getServerAddressAndPort())
+    }
+
     private fun fakedns(v2rayConfig: V2rayConfig) {
         if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true
             && settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
         ) {
             v2rayConfig.fakedns = listOf(V2rayConfig.FakednsBean())
-            v2rayConfig.outbounds.filter { it.protocol == PROTOCOL_FREEDOM && it.tag == TAG_DIRECT }
-                .forEach {
-                    it.settings?.domainStrategy = "UseIP"
-                }
         }
     }
 
-    /**
-     * routing
-     */
     private fun routing(v2rayConfig: V2rayConfig): Boolean {
         try {
-            routingUserRule(
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
-                    ?: "", AppConfig.TAG_PROXY, v2rayConfig
-            )
-            routingUserRule(
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
-                    ?: "", TAG_DIRECT, v2rayConfig
-            )
-            routingUserRule(
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_BLOCKED)
-                    ?: "", AppConfig.TAG_BLOCKED, v2rayConfig
-            )
 
-            v2rayConfig.routing.domainStrategy =
+            v2rayConfig.routing.domainStrategy = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "IPIfNonMatch"
-                settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY)
-                    ?: "IPIfNonMatch"
-//            v2rayConfig.routing.domainMatcher = "mph"
-            val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE)
-                ?: ERoutingMode.BYPASS_LAN_MAINLAND.value
 
-            // Hardcode googleapis.cn gstatic.com
+            val rulesetItems = MmkvManager.decodeRoutingRulesets()
-            val googleapisRoute = V2rayConfig.RoutingBean.RulesBean(
+            rulesetItems?.forEach { key ->
-                outboundTag = AppConfig.TAG_PROXY,
+                routingUserRule(key, v2rayConfig)
-                domain = arrayListOf("domain:googleapis.cn", "domain:gstatic.com")
-            )
-
-            when (routingMode) {
-                ERoutingMode.BYPASS_LAN.value -> {
-                    routingGeo("ip", "private", TAG_DIRECT, v2rayConfig)
-                }
-
-                ERoutingMode.BYPASS_MAINLAND.value -> {
-                    routingGeo("", "cn", TAG_DIRECT, v2rayConfig)
-                    routingGeo("domain", "geolocation-cn", TAG_DIRECT, v2rayConfig)
-                    v2rayConfig.routing.rules.add(0, googleapisRoute)
-                }
-
-                ERoutingMode.BYPASS_LAN_MAINLAND.value -> {
-                    routingGeo("ip", "private", TAG_DIRECT, v2rayConfig)
-                    routingGeo("", "cn", TAG_DIRECT, v2rayConfig)
-                    routingGeo("domain", "geolocation-cn", TAG_DIRECT, v2rayConfig)
-                    v2rayConfig.routing.rules.add(0, googleapisRoute)
-                }
-
-                ERoutingMode.GLOBAL_DIRECT.value -> {
-                    val globalDirect = V2rayConfig.RoutingBean.RulesBean(
-                        outboundTag = TAG_DIRECT,
-                        port = "0-65535"
-                    )
-                    v2rayConfig.routing.rules.add(globalDirect)
-                }
             }
-
-            if (routingMode != ERoutingMode.GLOBAL_DIRECT.value) {
-                v2rayConfig.routing.rules.add(
-                    V2rayConfig.RoutingBean.RulesBean(
-                        outboundTag = AppConfig.TAG_PROXY,
-                        port = "0-65535"
-                    )
-                )
-            }
-
         } catch (e: Exception) {
             e.printStackTrace()
             return false
@@ -252,96 +203,46 @@ object V2rayConfigUtil {
         return true
     }
 
-    private fun routingGeo(
+    private fun routingUserRule(item: RulesetItem?, v2rayConfig: V2rayConfig) {
-        ipOrDomain: String,
-        code: String,
-        tag: String,
-        v2rayConfig: V2rayConfig
-    ) {
         try {
-            if (!TextUtils.isEmpty(code)) {
+            if (item == null || !item.enabled) {
-                //IP
+                return
-                if (ipOrDomain == "ip" || ipOrDomain == "") {
-                    val rulesIP = V2rayConfig.RoutingBean.RulesBean()
-                    rulesIP.outboundTag = tag
-                    rulesIP.ip = ArrayList()
-                    rulesIP.ip?.add("geoip:$code")
-                    v2rayConfig.routing.rules.add(rulesIP)
-                }
-
-                if (ipOrDomain == "domain" || ipOrDomain == "") {
-                    //Domain
-                    val rulesDomain = V2rayConfig.RoutingBean.RulesBean()
-                    rulesDomain.outboundTag = tag
-                    rulesDomain.domain = ArrayList()
-                    rulesDomain.domain?.add("geosite:$code")
-                    v2rayConfig.routing.rules.add(rulesDomain)
-                }
             }
+
+            val rule = JsonUtil.fromJson(JsonUtil.toJson(item), RulesBean::class.java) ?: return
+
+            v2rayConfig.routing.rules.add(rule)
+
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
-    private fun routingUserRule(userRule: String, tag: String, v2rayConfig: V2rayConfig) {
+    private fun userRule2Domain(tag: String): ArrayList<String> {
-        try {
+        val domain = ArrayList<String>()
-            if (!TextUtils.isEmpty(userRule)) {
-                //Domain
-                val rulesDomain = V2rayConfig.RoutingBean.RulesBean()
-                rulesDomain.outboundTag = tag
-                rulesDomain.domain = ArrayList()
 
-                //IP
+        val rulesetItems = MmkvManager.decodeRoutingRulesets()
-                val rulesIP = V2rayConfig.RoutingBean.RulesBean()
+        rulesetItems?.forEach { key ->
-                rulesIP.outboundTag = tag
+            if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
-                rulesIP.ip = ArrayList()
+                key.domain?.forEach {
-
+                    if (it != GEOSITE_PRIVATE
-                userRule.split(",").map { it.trim() }.forEach {
+                        && (it.startsWith("geosite:") || it.startsWith("domain:"))
-                    if (it.startsWith("ext:") && it.contains("geoip")) {
+                    ) {
-                        rulesIP.ip?.add(it)
+                        domain.add(it)
-                    } else if (Utils.isIpAddress(it) || it.startsWith("geoip:")) {
-                        rulesIP.ip?.add(it)
-                    } else if (it.isNotEmpty()) {
-                        rulesDomain.domain?.add(it)
                     }
                 }
-                if ((rulesDomain.domain?.size ?: 0) > 0) {
-                    v2rayConfig.routing.rules.add(rulesDomain)
-                }
-                if ((rulesIP.ip?.size ?: 0) > 0) {
-                    v2rayConfig.routing.rules.add(rulesIP)
-                }
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
         }
-    }
 
-    private fun userRule2Domian(userRule: String): ArrayList<String> {
-        val domain = ArrayList<String>()
-        userRule.split(",").map { it.trim() }.forEach {
-            if (it.startsWith("geosite:") || it.startsWith("domain:")) {
-                domain.add(it)
-            }
-        }
         return domain
     }
 
-    /**
-     * Custom Dns
-     */
     private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
         try {
             if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
-                val geositeCn = arrayListOf("geosite:cn")
+                val geositeCn = arrayListOf(GEOSITE_CN)
-                val proxyDomain = userRule2Domian(
+                val proxyDomain = userRule2Domain(TAG_PROXY)
-                    settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
+                val directDomain = userRule2Domain(TAG_DIRECT)
-                        ?: ""
-                )
-                val directDomain = userRule2Domian(
-                    settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
-                        ?: ""
-                )
                 // fakedns with all domains to make it always top priority
                 v2rayConfig.dns.servers?.add(
                     0,
@@ -369,7 +270,7 @@ object V2rayConfigUtil {
                     V2rayConfig.InboundBean(
                         tag = "dns-in",
                         port = localDnsPort,
-                        listen = "127.0.0.1",
+                        listen = LOOPBACK,
                         protocol = "dokodemo-door",
                         settings = dnsInboundSettings,
                         sniffing = null
@@ -407,15 +308,12 @@ object V2rayConfigUtil {
 
     private fun dns(v2rayConfig: V2rayConfig): Boolean {
         try {
-            val hosts = mutableMapOf<String, String>()
+            val hosts = mutableMapOf<String, Any>()
             val servers = ArrayList<Any>()
 
             //remote Dns
             val remoteDns = Utils.getRemoteDnsServers()
-            val proxyDomain = userRule2Domian(
+            val proxyDomain = userRule2Domain(TAG_PROXY)
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
-                    ?: ""
-            )
             remoteDns.forEach {
                 servers.add(it)
             }
@@ -432,16 +330,9 @@ object V2rayConfigUtil {
 
             // domestic DNS
             val domesticDns = Utils.getDomesticDnsServers()
-            val directDomain = userRule2Domian(
+            val directDomain = userRule2Domain(TAG_DIRECT)
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
+            val isCnRoutingMode = directDomain.contains(GEOSITE_CN)
-                    ?: ""
+            val geoipCn = arrayListOf(GEOIP_CN)
-            )
-            val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE)
-                ?: ERoutingMode.BYPASS_LAN_MAINLAND.value
-            val isCnRoutingMode =
-                (routingMode == ERoutingMode.BYPASS_MAINLAND.value || routingMode == ERoutingMode.BYPASS_LAN_MAINLAND.value)
-            val geoipCn = arrayListOf("geoip:cn")
-
             if (directDomain.size > 0) {
                 servers.add(
                     V2rayConfig.DnsBean.ServersBean(
@@ -452,17 +343,6 @@ object V2rayConfigUtil {
                     )
                 )
             }
-            if (isCnRoutingMode) {
-                val geositeCn = arrayListOf("geosite:cn", "geosite:geolocation-cn")
-                servers.add(
-                    V2rayConfig.DnsBean.ServersBean(
-                        domesticDns.first(),
-                        53,
-                        geositeCn,
-                        geoipCn
-                    )
-                )
-            }
 
             if (Utils.isPureIpAddress(domesticDns.first())) {
                 v2rayConfig.routing.rules.add(
@@ -476,17 +356,20 @@ object V2rayConfigUtil {
             }
 
             //block dns
-            val blkDomain = userRule2Domian(
+            val blkDomain = userRule2Domain(TAG_BLOCKED)
-                settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_BLOCKED)
-                    ?: ""
-            )
             if (blkDomain.size > 0) {
-                hosts.putAll(blkDomain.map { it to "127.0.0.1" })
+                hosts.putAll(blkDomain.map { it to LOOPBACK })
             }
 
             // hardcode googleapi rule to fix play store problems
             hosts["domain:googleapis.cn"] = "googleapis.com"
 
+            // hardcode popular Android Private DNS rule to fix localhost DNS problem
+            hosts["dns.pub"] = arrayListOf("1.12.12.12", "120.53.53.53")
+            hosts["dns.alidns.com"] = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
+            hosts["one.one.one.one"] = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+            hosts["dns.google"] = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+
             // DNS dns对象
             v2rayConfig.dns = V2rayConfig.DnsBean(
                 servers = servers,
@@ -497,7 +380,7 @@ object V2rayConfigUtil {
             if (Utils.isPureIpAddress(remoteDns.first())) {
                 v2rayConfig.routing.rules.add(
                     0, V2rayConfig.RoutingBean.RulesBean(
-                        outboundTag = AppConfig.TAG_PROXY,
+                        outboundTag = TAG_PROXY,
                         port = "53",
                         ip = arrayListOf(remoteDns.first()),
                         domain = null
@@ -517,8 +400,10 @@ object V2rayConfigUtil {
             val protocol = outbound.protocol
             if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.SOCKS.name, true)
+                || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.WIREGUARD.name, true)
+                || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
                 muxEnabled = false
             } else if (protocol.equals(EConfigType.VLESS.name, true)
@@ -560,7 +445,7 @@ object V2rayConfigUtil {
                 val requestString: String by lazy {
                     """{"version":"1.1","method":"GET","headers":{"User-Agent":["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36","Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}"""
                 }
-                outbound.streamSettings?.tcpSettings?.header?.request = Gson().fromJson(
+                outbound.streamSettings?.tcpSettings?.header?.request = JsonUtil.fromJson(
                     requestString,
                     V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean.RequestBean::class.java
                 )
@@ -618,7 +503,14 @@ object V2rayConfigUtil {
                         ?: "50-100",
                     interval = settingsStorage?.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL)
                         ?: "10-20"
-                )
+                ),
+                noises = listOf(
+                    V2rayConfig.OutboundBean.OutSettingsBean.NoiseBean(
+                        type = "rand",
+                        packet = "100-200",
+                        delay = "10-20",
+                    )
+                ),
             )
             fragmentOutbound.streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean(
                 sockopt = V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
@@ -639,4 +531,67 @@ object V2rayConfigUtil {
         }
         return true
     }
-}
+
+    private fun moreOutbounds(v2rayConfig: V2rayConfig, subscriptionId: String, isPlugin: Boolean): Pair<Boolean, String> {
+        val returnPair = Pair(false, "")
+        var domainPort: String = ""
+
+        if (isPlugin) {
+            return returnPair
+        }
+        //fragment proxy
+        if (settingsStorage?.decodeBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) {
+            return returnPair
+        }
+
+        if (subscriptionId.isNullOrEmpty()) {
+            return returnPair
+        }
+        try {
+            val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return returnPair
+
+            //current proxy
+            val outbound = v2rayConfig.outbounds[0]
+
+            //Previous proxy
+            val prevNode = SettingsManager.getServerViaRemarks(subItem.prevProfile)
+            if (prevNode != null) {
+                val prevOutbound = prevNode.getProxyOutbound()
+                if (prevOutbound != null) {
+                    updateOutboundWithGlobalSettings(prevOutbound)
+                    prevOutbound.tag = TAG_PROXY + "2"
+                    v2rayConfig.outbounds.add(prevOutbound)
+                    outbound.streamSettings?.sockopt =
+                        V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
+                            dialerProxy = prevOutbound.tag
+                        )
+                    domainPort = prevOutbound.getServerAddressAndPort()
+                }
+            }
+
+            //Next proxy
+            val nextNode = SettingsManager.getServerViaRemarks(subItem.nextProfile)
+            if (nextNode != null) {
+                val nextOutbound = nextNode.getProxyOutbound()
+                if (nextOutbound != null) {
+                    updateOutboundWithGlobalSettings(nextOutbound)
+                    nextOutbound.tag = TAG_PROXY
+                    v2rayConfig.outbounds.add(0, nextOutbound)
+                    outbound.tag = TAG_PROXY + "1"
+                    nextOutbound.streamSettings?.sockopt =
+                        V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
+                            dialerProxy = outbound.tag
+                        )
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return returnPair
+        }
+
+        if (domainPort.isNotEmpty()) {
+            return Pair(true, domainPort)
+        }
+        return returnPair
+    }
+}

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

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

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

@@ -0,0 +1,102 @@
+package com.v2ray.ang.util.fmt
+
+import android.text.TextUtils
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.Hysteria2Bean
+import com.v2ray.ang.dto.ServerConfig
+import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.util.Utils
+import java.net.URI
+
+object Hysteria2Fmt : FmtBase() {
+
+    fun parse(str: String): ServerConfig {
+        var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
+        val config = ServerConfig.create(EConfigType.HYSTERIA2)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+
+        val queryParam = uri.rawQuery.split("&")
+            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
+
+        config.outboundBean?.streamSettings?.populateTlsSettings(
+            V2rayConfig.TLS,
+            if ((queryParam["insecure"].orEmpty()) == "1") true else allowInsecure,
+            queryParam["sni"] ?: uri.idnHost,
+            null,
+            queryParam["alpn"],
+            null,
+            null,
+            null
+        )
+
+        config.outboundBean?.settings?.servers?.get(0)?.let { server ->
+            server.address = uri.idnHost
+            server.port = uri.port
+            server.password = uri.userInfo
+        }
+        if (!queryParam["obfs-password"].isNullOrEmpty()) {
+            config.outboundBean?.settings?.obfsPassword = queryParam["obfs-password"]
+        }
+
+        return config
+    }
+
+    fun toUri(config: ServerConfig): String {
+        val outbound = config.getProxyOutbound() ?: return ""
+        val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
+
+
+        val dicQuery = HashMap<String, String>()
+        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
+        streamSetting.tlsSettings?.let { tlsSetting ->
+            dicQuery["insecure"] = if (tlsSetting.allowInsecure) "1" else "0"
+            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 (!outbound.settings?.obfsPassword.isNullOrEmpty()) {
+            dicQuery["obfs"] = "salamander"
+            dicQuery["obfs-password"] = outbound.settings?.obfsPassword ?: ""
+        }
+
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
+    }
+
+    fun toNativeConfig(config: ServerConfig, socksPort: Int): Hysteria2Bean? {
+        val outbound = config.getProxyOutbound() ?: return null
+        val tls = outbound.streamSettings?.tlsSettings
+        val obfs = if (outbound.settings?.obfsPassword.isNullOrEmpty()) null else
+            Hysteria2Bean.ObfsBean(
+                type = "salamander",
+                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
+                    password = outbound.settings?.obfsPassword
+                )
+            )
+
+        val bean = Hysteria2Bean(
+            server = outbound.getServerAddressAndPort(),
+            auth = outbound.getPassword(),
+            obfs = obfs,
+            socks5 = Hysteria2Bean.Socks5Bean(
+                listen = "$LOOPBACK:${socksPort}",
+            ),
+            http = Hysteria2Bean.Socks5Bean(
+                listen = "$LOOPBACK:${socksPort}",
+            ),
+            tls = Hysteria2Bean.TlsBean(
+                sni = tls?.serverName ?: outbound.getServerAddress(),
+                insecure = tls?.allowInsecure
+            )
+        )
+        return bean
+    }
+}

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

@@ -8,8 +8,8 @@ import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object ShadowsocksFmt {
+object ShadowsocksFmt : FmtBase() {
-    fun parseShadowsocks(str: String): ServerConfig? {
+    fun parse(str: String): ServerConfig? {
         val config = ServerConfig.create(EConfigType.SHADOWSOCKS)
         if (!tryResolveResolveSip002(str, config)) {
             var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
@@ -52,22 +52,16 @@ object ShadowsocksFmt {
 
     fun toUri(config: ServerConfig): String {
         val outbound = config.getProxyOutbound() ?: return ""
-        val remark = "#" + Utils.urlEncode(config.remarks)
+        
-        val pw =
+        val pw = Utils.encode("${outbound.getSecurityEncryption()}:${outbound.getPassword()}")
-            Utils.encode("${outbound.getSecurityEncryption()}:${outbound.getPassword()}")
+
-        val url = String.format(
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), pw, null, config.remarks)
-            "%s@%s:%s",
-            pw,
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + remark
     }
 
     private fun tryResolveResolveSip002(str: String, config: ServerConfig): Boolean {
         try {
             val uri = URI(Utils.fixIllegalUrl(str))
-            config.remarks = Utils.urlDecode(uri.fragment ?: "")
+            config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
 
             val method: String
             val password: String
@@ -88,7 +82,7 @@ object ShadowsocksFmt {
                 password = base64Decode.substringAfter(":")
             }
 
-            val query = Utils.urlDecode(uri.query ?: "")
+            val query = Utils.urlDecode(uri.query.orEmpty())
             if (query != "") {
                 val queryPairs = HashMap<String, String>()
                 val pairs = query.split(";")
@@ -137,7 +131,7 @@ object ShadowsocksFmt {
                 }
                 if ("tls" in queryPairs) {
                     config.outboundBean?.streamSettings?.populateTlsSettings(
-                        "tls", false, sni ?: "", null, null, null, null, null
+                        "tls", false, sni.orEmpty(), null, null, null, null, null
                     )
                 }
 

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

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

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

@@ -1,65 +1,67 @@
 package com.v2ray.ang.util.fmt
 
 import android.text.TextUtils
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object TrojanFmt {
+object TrojanFmt : FmtBase() {
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
 
-    fun parseTrojan(str: String): ServerConfig? {
+    fun parse(str: String): ServerConfig {
         var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
         val config = ServerConfig.create(EConfigType.TROJAN)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment ?: "")
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
 
         var flow = ""
         var fingerprint = config.outboundBean?.streamSettings?.tlsSettings?.fingerprint
-        if (uri.rawQuery.isNullOrEmpty()) return null
+        if (uri.rawQuery.isNullOrEmpty()) {
-
+            config.outboundBean?.streamSettings?.populateTlsSettings(
-
+                V2rayConfig.TLS,
-        val queryParam = uri.rawQuery.split("&")
+                allowInsecure,
-            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
+                "",
-
+                fingerprint,
-        val sni = config.outboundBean?.streamSettings?.populateTransportSettings(
+                null,
-            queryParam["type"] ?: "tcp",
+                null,
-            queryParam["headerType"],
+                null,
-            queryParam["host"],
+                null
-            queryParam["path"],
+            )
-            queryParam["seed"],
+        } else {
-            queryParam["quicSecurity"],
+            val queryParam = uri.rawQuery.split("&")
-            queryParam["key"],
+                .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
-            queryParam["mode"],
-            queryParam["serviceName"],
-            queryParam["authority"]
-        )
-        fingerprint = queryParam["fp"] ?: ""
-        allowInsecure = if ((queryParam["allowInsecure"] ?: "") == "1") true else allowInsecure
-        config.outboundBean?.streamSettings?.populateTlsSettings(
-            queryParam["security"] ?: V2rayConfig.TLS,
-            allowInsecure,
-            queryParam["sni"] ?: sni ?: "",
-            fingerprint,
-            queryParam["alpn"],
-            null,
-            null,
-            null
-        )
-        flow = queryParam["flow"] ?: ""
 
+            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"],
+                queryParam["authority"]
+            )
+            fingerprint = queryParam["fp"].orEmpty()
+            allowInsecure = if ((queryParam["allowInsecure"].orEmpty()) == "1") true else allowInsecure
+            config.outboundBean?.streamSettings?.populateTlsSettings(
+                queryParam["security"] ?: V2rayConfig.TLS,
+                allowInsecure,
+                queryParam["sni"] ?: sni.orEmpty(),
+                fingerprint,
+                queryParam["alpn"],
+                null,
+                null,
+                null
+            )
+            flow = queryParam["flow"].orEmpty()
+        }
         config.outboundBean?.settings?.servers?.get(0)?.let { server ->
             server.address = uri.idnHost
             server.port = uri.port
@@ -74,98 +76,15 @@ object TrojanFmt {
         val outbound = config.getProxyOutbound() ?: return ""
         val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
+        
-        val dicQuery = HashMap<String, String>()
+        val dicQuery = getStdTransport(outbound, streamSetting)
+
         config.outboundBean?.settings?.servers?.get(0)?.flow?.let {
             if (!TextUtils.isEmpty(it)) {
                 dicQuery["flow"] = it
             }
         }
 
-        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
-        (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 }
-
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            when (streamSetting.network) {
-                "tcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                }
-
-                "kcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["seed"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "ws", "httpupgrade", "splithttp" -> {
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "http", "h2" -> {
-                    dicQuery["type"] = "http"
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "quic" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    dicQuery["quicSecurity"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["key"] = Utils.urlEncode(transportDetails[2])
-                }
-
-                "grpc" -> {
-                    dicQuery["mode"] = transportDetails[0]
-                    dicQuery["authority"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["serviceName"] = Utils.urlEncode(transportDetails[2])
-                }
-            }
-        }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
-
-        val url = String.format(
-            "%s@%s:%s",
-            outbound.getPassword(),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
     }
 }

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

@@ -1,25 +1,18 @@
 package com.v2ray.ang.util.fmt
 
 import android.text.TextUtils
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object VlessFmt {
+object VlessFmt : FmtBase() {
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
 
-    fun parseVless(str: String): ServerConfig? {
+    fun parse(str: String): ServerConfig? {
         var allowInsecure = settingsStorage?.decodeBool(AppConfig.PREF_ALLOW_INSECURE) ?: false
         val config = ServerConfig.create(EConfigType.VLESS)
 
@@ -30,13 +23,13 @@ object VlessFmt {
 
         val streamSetting = config.outboundBean?.streamSettings ?: return null
 
-        config.remarks = Utils.urlDecode(uri.fragment ?: "")
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
         config.outboundBean.settings?.vnext?.get(0)?.let { vnext ->
             vnext.address = uri.idnHost
             vnext.port = uri.port
             vnext.users[0].id = uri.userInfo
             vnext.users[0].encryption = queryParam["encryption"] ?: "none"
-            vnext.users[0].flow = queryParam["flow"] ?: ""
+            vnext.users[0].flow = queryParam["flow"].orEmpty()
         }
 
         val sni = streamSetting.populateTransportSettings(
@@ -51,16 +44,16 @@ object VlessFmt {
             queryParam["serviceName"],
             queryParam["authority"]
         )
-        allowInsecure = if ((queryParam["allowInsecure"] ?: "") == "1") true else allowInsecure
+        allowInsecure = if ((queryParam["allowInsecure"].orEmpty()) == "1") true else allowInsecure
         streamSetting.populateTlsSettings(
-            queryParam["security"] ?: "",
+            queryParam["security"].orEmpty(),
             allowInsecure,
             queryParam["sni"] ?: sni,
-            queryParam["fp"] ?: "",
+            queryParam["fp"].orEmpty(),
             queryParam["alpn"],
-            queryParam["pbk"] ?: "",
+            queryParam["pbk"].orEmpty(),
-            queryParam["sid"] ?: "",
+            queryParam["sid"].orEmpty(),
-            queryParam["spx"] ?: ""
+            queryParam["spx"].orEmpty()
         )
 
         return config
@@ -70,8 +63,9 @@ object VlessFmt {
         val outbound = config.getProxyOutbound() ?: return ""
         val streamSetting = outbound.streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean()
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
+        
-        val dicQuery = HashMap<String, String>()
+        val dicQuery = getStdTransport(outbound, streamSetting)
+
         outbound.settings?.vnext?.get(0)?.users?.get(0)?.flow?.let {
             if (!TextUtils.isEmpty(it)) {
                 dicQuery["flow"] = it
@@ -81,91 +75,6 @@ object VlessFmt {
             if (outbound.getSecurityEncryption().isNullOrEmpty()) "none"
             else outbound.getSecurityEncryption().orEmpty()
 
-
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
-        dicQuery["security"] = streamSetting.security.ifEmpty { "none" }
-        (streamSetting.tlsSettings
-            ?: streamSetting.realitySettings)?.let { tlsSetting ->
-            if (!TextUtils.isEmpty(tlsSetting.serverName)) {
-                dicQuery["sni"] = tlsSetting.serverName
-            }
-            if (!tlsSetting.alpn.isNullOrEmpty() && tlsSetting.alpn.isNotEmpty()) {
-                dicQuery["alpn"] =
-                    Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
-            }
-            if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
-                dicQuery["fp"] = tlsSetting.fingerprint ?: ""
-            }
-            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 }
-
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            when (streamSetting.network) {
-                "tcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                }
-
-                "kcp" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["seed"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "ws", "httpupgrade", "splithttp" -> {
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "http", "h2" -> {
-                    dicQuery["type"] = "http"
-                    if (!TextUtils.isEmpty(transportDetails[1])) {
-                        dicQuery["host"] = Utils.urlEncode(transportDetails[1])
-                    }
-                    if (!TextUtils.isEmpty(transportDetails[2])) {
-                        dicQuery["path"] = Utils.urlEncode(transportDetails[2])
-                    }
-                }
-
-                "quic" -> {
-                    dicQuery["headerType"] = transportDetails[0].ifEmpty { "none" }
-                    dicQuery["quicSecurity"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["key"] = Utils.urlEncode(transportDetails[2])
-                }
-
-                "grpc" -> {
-                    dicQuery["mode"] = transportDetails[0]
-                    dicQuery["authority"] = Utils.urlEncode(transportDetails[1])
-                    dicQuery["serviceName"] = Utils.urlEncode(transportDetails[2])
-                }
-            }
-        }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
-
-        val url = String.format(
-            "%s@%s:%s",
-            outbound.getPassword(),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
     }
 }

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

@@ -2,26 +2,21 @@ package com.v2ray.ang.util.fmt
 
 import android.text.TextUtils
 import android.util.Log
-import com.google.gson.Gson
+
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object VmessFmt {
+object VmessFmt : FmtBase() {
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE
-        )
-    }
 
-    fun parseVmess(str: String): ServerConfig? {
+    fun parse(str: String): ServerConfig? {
         if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
             return parseVmessStd(str)
         }
@@ -35,7 +30,7 @@ object VmessFmt {
             Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
             return null
         }
-        val vmessQRCode = Gson().fromJson(result, VmessQRCode::class.java)
+        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
         // Although VmessQRCode fields are non null, looks like Gson may still create null fields
         if (TextUtils.isEmpty(vmessQRCode.add)
             || TextUtils.isEmpty(vmessQRCode.port)
@@ -99,14 +94,14 @@ object VmessFmt {
         vmessQRCode.tls = streamSetting.security
         vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
         vmessQRCode.alpn =
-            Utils.removeWhiteSpace(streamSetting.tlsSettings?.alpn?.joinToString()).orEmpty()
+            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]
             vmessQRCode.path = transportDetails[2]
         }
-        val json = Gson().toJson(vmessQRCode)
+        val json = JsonUtil.toJson(vmessQRCode)
         return Utils.encode(json)
     }
 
@@ -121,7 +116,7 @@ object VmessFmt {
 
         val streamSetting = config.outboundBean?.streamSettings ?: return null
 
-        config.remarks = Utils.urlDecode(uri.fragment ?: "")
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
         config.outboundBean.settings?.vnext?.get(0)?.let { vnext ->
             vnext.address = uri.idnHost
             vnext.port = uri.port
@@ -143,12 +138,12 @@ object VmessFmt {
             queryParam["authority"]
         )
 
-        allowInsecure = if ((queryParam["allowInsecure"] ?: "") == "1") true else allowInsecure
+        allowInsecure = if ((queryParam["allowInsecure"].orEmpty()) == "1") true else allowInsecure
         streamSetting.populateTlsSettings(
-            queryParam["security"] ?: "",
+            queryParam["security"].orEmpty(),
             allowInsecure,
             queryParam["sni"] ?: sni,
-            queryParam["fp"] ?: "",
+            queryParam["fp"].orEmpty(),
             queryParam["alpn"],
             null,
             null,

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

@@ -8,12 +8,12 @@ import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
-object WireguardFmt {
+object WireguardFmt : FmtBase() {
-    fun parseWireguard(str: String): ServerConfig? {
+    fun parse(str: String): ServerConfig? {
         val uri = URI(Utils.fixIllegalUrl(str))
         if (uri.rawQuery != null) {
             val config = ServerConfig.create(EConfigType.WIREGUARD)
-            config.remarks = Utils.urlDecode(uri.fragment ?: "")
+            config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
 
             val queryParam = uri.rawQuery.split("&")
                 .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
@@ -24,7 +24,7 @@ object WireguardFmt {
                     (queryParam["address"]
                         ?: AppConfig.WIREGUARD_LOCAL_ADDRESS_V4).removeWhiteSpace()
                         .split(",")
-                wireguard.peers?.get(0)?.publicKey = queryParam["publickey"] ?: ""
+                wireguard.peers?.get(0)?.publicKey = queryParam["publickey"].orEmpty()
                 wireguard.peers?.get(0)?.endpoint =
                     Utils.getIpv6Address(uri.idnHost) + ":${uri.port}"
                 wireguard.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
@@ -38,36 +38,55 @@ object WireguardFmt {
         }
     }
 
+    fun parseWireguardConfFile(str: String): ServerConfig? {
+        val config = ServerConfig.create(EConfigType.WIREGUARD)
+        val queryParam: MutableMap<String, String> = mutableMapOf()
+
+        var currentSection: String? = null
+
+        str.lines().forEach { line ->
+            val trimmedLine = line.trim()
+
+            when {
+                trimmedLine.startsWith("[Interface]", ignoreCase = true) -> currentSection = "Interface"
+                trimmedLine.startsWith("[Peer]", ignoreCase = true) -> currentSection = "Peer"
+                trimmedLine.isBlank() || trimmedLine.startsWith("#") -> Unit  // Skip blank lines or comments
+                currentSection != null -> {
+                    val (key, value) = trimmedLine.split("=").map { it.trim() }
+                    queryParam[key.lowercase()] = value  // Store the key in lowercase for case-insensitivity
+                }
+            }
+        }
+
+        config.outboundBean?.settings?.let { wireguard ->
+            wireguard.secretKey = queryParam["privatekey"].orEmpty()
+            wireguard.address = (queryParam["address"] ?: AppConfig.WIREGUARD_LOCAL_ADDRESS_V4).removeWhiteSpace().split(",")
+            wireguard.peers?.getOrNull(0)?.publicKey = queryParam["publickey"].orEmpty()
+            wireguard.peers?.getOrNull(0)?.endpoint = queryParam["endpoint"].orEmpty()
+            wireguard.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
+            wireguard.reserved = (queryParam["reserved"] ?: "0,0,0").removeWhiteSpace().split(",").map { it.toInt() }
+        }
+
+        return config
+    }
+
+
     fun toUri(config: ServerConfig): String {
         val outbound = config.getProxyOutbound() ?: return ""
 
-        val remark = "#" + Utils.urlEncode(config.remarks)
+
         val dicQuery = HashMap<String, String>()
-        dicQuery["publickey"] =
+        dicQuery["publickey"] = outbound.settings?.peers?.get(0)?.publicKey.toString()
-            Utils.urlEncode(outbound.settings?.peers?.get(0)?.publicKey.toString())
         if (outbound.settings?.reserved != null) {
-            dicQuery["reserved"] = Utils.urlEncode(
+            dicQuery["reserved"] = Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString(",")).toString()
-                Utils.removeWhiteSpace(outbound.settings?.reserved?.joinToString())
+
-                    .toString()
-            )
         }
-        dicQuery["address"] = Utils.urlEncode(
+        dicQuery["address"] = Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString(",")).toString()
-            Utils.removeWhiteSpace((outbound.settings?.address as List<*>).joinToString())
+
-                .toString()
-        )
         if (outbound.settings?.mtu != null) {
             dicQuery["mtu"] = outbound.settings?.mtu.toString()
         }
-        val query = "?" + dicQuery.toList().joinToString(
-            separator = "&",
-            transform = { it.first + "=" + it.second })
 
-        val url = String.format(
+        return toUri(outbound.getServerAddress(), outbound.getServerPort(), outbound.getPassword(), dicQuery, config.remarks)
-            "%s@%s:%s",
-            Utils.urlEncode(outbound.getPassword().toString()),
-            Utils.getIpv6Address(outbound.getServerAddress()),
-            outbound.getServerPort()
-        )
-        return url + query + remark
     }
 }

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

@@ -3,36 +3,32 @@ package com.v2ray.ang.viewmodel
 import android.app.Application
 import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.AssetManager
 import android.os.Build
 import android.util.Log
-import android.view.LayoutInflater
-import android.widget.ArrayAdapter
-import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.google.gson.Gson
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
-import com.v2ray.ang.databinding.DialogConfigFilterBinding
 import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.AngConfigManager
+import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.KEY_ANG_CONFIGS
 import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.V2rayConfigUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -43,34 +39,15 @@ import java.io.FileOutputStream
 import java.util.Collections
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
-    private val mainStorage by lazy {
+    private var serverList = MmkvManager.decodeServerList()
-        MMKV.mmkvWithID(
+    var subscriptionId: String = MmkvManager.settingsStorage.decodeString(AppConfig.CACHE_SUBSCRIPTION_ID, "").orEmpty()
-            MmkvManager.ID_MAIN,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val serverRawStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SERVER_RAW,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
 
-    var serverList = MmkvManager.decodeServerList()
+    //var keywordFilter: String = MmkvManager.settingsStorage.decodeString(AppConfig.CACHE_KEYWORD_FILTER, "")?:""
-    var subscriptionId: String = settingsStorage.decodeString(AppConfig.CACHE_SUBSCRIPTION_ID, "")?:""
+    var keywordFilter = ""
-    var keywordFilter: String = settingsStorage.decodeString(AppConfig.CACHE_KEYWORD_FILTER, "")?:""
-        private set
     val serversCache = mutableListOf<ServersCache>()
     val isRunning by lazy { MutableLiveData<Boolean>() }
     val updateListAction by lazy { MutableLiveData<Int>() }
     val updateTestResultAction by lazy { MutableLiveData<String>() }
-
     private val tcpingTestScope by lazy { CoroutineScope(Dispatchers.IO) }
 
     fun startListenBroadcast() {
@@ -121,12 +98,19 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             try {
                 val config = ServerConfig.create(EConfigType.CUSTOM)
                 config.subscriptionId = subscriptionId
-                config.fullConfig = Gson().fromJson(server, V2rayConfig::class.java)
+                config.fullConfig = JsonUtil.fromJson(server, V2rayConfig::class.java)
                 config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
                 val key = MmkvManager.encodeServerConfig("", config)
-                serverRawStorage?.encode(key, server)
+                MmkvManager.encodeServerRaw(key, server)
                 serverList.add(0, key)
-                serversCache.add(0, ServersCache(key, config))
+                val profile = ProfileItem(
+                    configType = config.configType,
+                    subscriptionId = config.subscriptionId,
+                    remarks = config.remarks,
+                    server = config.getProxyOutbound()?.getServerAddress(),
+                    serverPort = config.getProxyOutbound()?.getServerPort(),
+                )
+                serversCache.add(0, ServersCache(key, profile))
                 return true
             } catch (e: Exception) {
                 e.printStackTrace()
@@ -138,24 +122,61 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun swapServer(fromPosition: Int, toPosition: Int) {
         Collections.swap(serverList, fromPosition, toPosition)
         Collections.swap(serversCache, fromPosition, toPosition)
-        mainStorage?.encode(KEY_ANG_CONFIGS, Gson().toJson(serverList))
+        MmkvManager.encodeServerList(serverList)
     }
 
     @Synchronized
     fun updateCache() {
         serversCache.clear()
         for (guid in serverList) {
-            val config = MmkvManager.decodeServerConfig(guid) ?: continue
+            var profile = MmkvManager.decodeProfileConfig(guid)
-            if (subscriptionId.isNotEmpty() && subscriptionId != config.subscriptionId) {
+            if (profile == null) {
+                val config = MmkvManager.decodeServerConfig(guid) ?: continue
+                profile = ProfileItem(
+                    configType = config.configType,
+                    subscriptionId = config.subscriptionId,
+                    remarks = config.remarks,
+                    server = config.getProxyOutbound()?.getServerAddress(),
+                    serverPort = config.getProxyOutbound()?.getServerPort(),
+                )
+                MmkvManager.encodeServerConfig(guid, config)
+            }
+
+            if (subscriptionId.isNotEmpty() && subscriptionId != profile.subscriptionId) {
                 continue
             }
 
-            if (keywordFilter.isEmpty() || config.remarks.contains(keywordFilter)) {
+            if (keywordFilter.isEmpty() || profile.remarks.contains(keywordFilter)) {
-                serversCache.add(ServersCache(guid, config))
+                serversCache.add(ServersCache(guid, profile))
             }
         }
     }
 
+    fun updateConfigViaSubAll(): Int {
+        if (subscriptionId.isNullOrEmpty()) {
+            return AngConfigManager.updateConfigViaSubAll()
+        } else {
+            val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return 0
+            return updateConfigViaSub(Pair(subscriptionId, subItem))
+        }
+    }
+
+    fun exportAllServer(): Int {
+        val serverListCopy =
+            if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) {
+                serverList
+            } else {
+                serversCache.map { it.guid }.toList()
+            }
+
+        val ret = AngConfigManager.shareNonCustomConfigsToClipboard(
+            getApplication<AngApplication>(),
+            serverListCopy
+        )
+        return ret
+    }
+
+
     fun testAllTcping() {
         tcpingTestScope.coroutineContext[Job]?.cancelChildren()
         SpeedtestUtil.closeAllTcpSockets()
@@ -164,9 +185,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
         getApplication<AngApplication>().toast(R.string.connection_test_testing)
         for (item in serversCache) {
-            item.config.getProxyOutbound()?.let { outbound ->
+            item.profile.let { outbound ->
-                val serverAddress = outbound.getServerAddress()
+                val serverAddress = outbound.server
-                val serverPort = outbound.getServerPort()
+                val serverPort = outbound.serverPort
                 if (serverAddress != null && serverPort != null) {
                     tcpingTestScope.launch {
                         val testResult = SpeedtestUtil.tcping(serverAddress, serverPort)
@@ -190,14 +211,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         getApplication<AngApplication>().toast(R.string.connection_test_testing)
         viewModelScope.launch(Dispatchers.Default) { // without Dispatchers.Default viewModelScope will launch in main thread
             for (item in serversCopy) {
-                val config = V2rayConfigUtil.getV2rayConfig(getApplication(), item.guid)
+                MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid)
-                if (config.status) {
-                    MessageUtil.sendMsg2TestService(
-                        getApplication(),
-                        AppConfig.MSG_MEASURE_CONFIG,
-                        Pair(item.guid, config.content)
-                    )
-                }
             }
         }
     }
@@ -206,60 +220,30 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         MessageUtil.sendMsg2Service(getApplication(), AppConfig.MSG_MEASURE_DELAY, "")
     }
 
-    fun filterConfig(context: Context) {
+    fun subscriptionIdChanged(id: String) {
+        if (subscriptionId != id) {
+            subscriptionId = id
+            MmkvManager.settingsStorage.encode(AppConfig.CACHE_SUBSCRIPTION_ID, subscriptionId)
+            reloadServerList()
+        }
+    }
+
+    fun getSubscriptions(context: Context): Pair<MutableList<String>?, MutableList<String>?> {
         val subscriptions = MmkvManager.decodeSubscriptions()
-        val listId = subscriptions.map { it.first }.toList().toMutableList()
+        if (subscriptionId.isNotEmpty()
-        val listRemarks = subscriptions.map { it.second.remarks }.toList().toMutableList()
+            && !subscriptions.map { it.first }.contains(subscriptionId)
-        listRemarks += context.getString(R.string.filter_config_all)
+        ) {
-        val checkedItem = if (subscriptionId.isNotEmpty()) {
+            subscriptionIdChanged("")
-            listId.indexOf(subscriptionId)
-        } else {
-            listRemarks.count() - 1
         }
-
+        if (subscriptions.isEmpty()) {
-        val ivBinding = DialogConfigFilterBinding.inflate(LayoutInflater.from(context))
+            return null to null
-        ivBinding.spSubscriptionId.adapter = ArrayAdapter<String>(
-            context,
-            android.R.layout.simple_spinner_dropdown_item,
-            listRemarks
-        )
-        ivBinding.spSubscriptionId.setSelection(checkedItem)
-        ivBinding.etKeyword.text = Utils.getEditable(keywordFilter)
-        val builder = AlertDialog.Builder(context).setView(ivBinding.root)
-        builder.setTitle(R.string.title_filter_config)
-        builder.setPositiveButton(R.string.tasker_setting_confirm) { dialogInterface: DialogInterface?, _: Int ->
-            try {
-                val position = ivBinding.spSubscriptionId.selectedItemPosition
-                subscriptionId = if (listRemarks.count() - 1 == position) {
-                    ""
-                } else {
-                    subscriptions[position].first
-                }
-                keywordFilter = ivBinding.etKeyword.text.toString()
-                settingsStorage?.encode(AppConfig.CACHE_SUBSCRIPTION_ID, subscriptionId)
-                settingsStorage?.encode(AppConfig.CACHE_KEYWORD_FILTER, keywordFilter)
-                reloadServerList()
-
-                dialogInterface?.dismiss()
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
         }
-        builder.show()
+        val listId = subscriptions.map { it.first }.toMutableList()
-//        AlertDialog.Builder(context)
+        listId.add(0, "")
-//            .setSingleChoiceItems(listRemarks.toTypedArray(), checkedItem) { dialog, i ->
+        val listRemarks = subscriptions.map { it.second.remarks }.toMutableList()
-//                try {
+        listRemarks.add(0, context.getString(R.string.filter_config_all))
-//                    subscriptionId = if (listRemarks.count() - 1 == i) {
+
-//                        ""
+        return listId to listRemarks
-//                    } else {
-//                        subscriptions[i].first
-//                    }
-//                    reloadServerList()
-//                    dialog.dismiss()
-//                } catch (e: Exception) {
-//                    e.printStackTrace()
-//                }
-//            }.show()
     }
 
     fun getPosition(guid: String): Int {
@@ -270,15 +254,21 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         return -1
     }
 
-    fun removeDuplicateServer() {
+    fun removeDuplicateServer(): Int {
+        val serversCacheCopy = mutableListOf<Pair<String, ServerConfig>>()
+        for (it in serversCache) {
+            val config = MmkvManager.decodeServerConfig(it.guid) ?: continue
+            serversCacheCopy.add(Pair(it.guid, config))
+        }
+
         val deleteServer = mutableListOf<String>()
-        serversCache.forEachIndexed { index, it ->
+        serversCacheCopy.forEachIndexed { index, it ->
-            val outbound = it.config.getProxyOutbound()
+            val outbound = it.second.getProxyOutbound()
-            serversCache.forEachIndexed { index2, it2 ->
+            serversCacheCopy.forEachIndexed { index2, it2 ->
                 if (index2 > index) {
-                    val outbound2 = it2.config.getProxyOutbound()
+                    val outbound2 = it2.second.getProxyOutbound()
-                    if (outbound == outbound2 && !deleteServer.contains(it2.guid)) {
+                    if (outbound == outbound2 && !deleteServer.contains(it2.first)) {
-                        deleteServer.add(it2.guid)
+                        deleteServer.add(it2.first)
                     }
                 }
             }
@@ -286,14 +276,52 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         for (it in deleteServer) {
             MmkvManager.removeServer(it)
         }
-        getApplication<AngApplication>().toast(
+
-            getApplication<AngApplication>().getString(
+        return deleteServer.count()
-                R.string.title_del_duplicate_config_count,
-                deleteServer.count()
-            )
-        )
     }
 
+    fun removeAllServer() {
+        if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) {
+            MmkvManager.removeAllServer()
+        } else {
+            val serversCopy = serversCache.toList()
+            for (item in serversCopy) {
+                MmkvManager.removeServer(item.guid)
+            }
+        }
+    }
+
+    fun removeInvalidServer() {
+        if (subscriptionId.isNullOrEmpty() && keywordFilter.isNullOrEmpty()) {
+            MmkvManager.removeInvalidServer("")
+        } else {
+            val serversCopy = serversCache.toList()
+            for (item in serversCopy) {
+                MmkvManager.removeInvalidServer(item.guid)
+            }
+        }
+    }
+
+    fun sortByTestResults() {
+        data class ServerDelay(var guid: String, var testDelayMillis: Long)
+
+        val serverDelays = mutableListOf<ServerDelay>()
+        val serverList = MmkvManager.decodeServerList()
+        serverList.forEach { key ->
+            val delay = MmkvManager.decodeServerAffiliationInfo(key)?.testDelayMillis ?: 0L
+            serverDelays.add(ServerDelay(key, if (delay <= 0L) 999999 else delay))
+        }
+        serverDelays.sortBy { it.testDelayMillis }
+
+        serverDelays.forEach {
+            serverList.remove(it.guid)
+            serverList.add(it.guid)
+        }
+
+        MmkvManager.encodeServerList(serverList)
+    }
+
+
     fun copyAssets(assets: AssetManager) {
         val extFolder = Utils.userAssetPath(getApplication<AngApplication>())
         viewModelScope.launch(Dispatchers.Default) {
@@ -320,6 +348,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
+    fun filterConfig(keyword: String) {
+        if (keyword == keywordFilter) {
+            return
+        }
+        keywordFilter = keyword
+        MmkvManager.settingsStorage.encode(AppConfig.CACHE_KEYWORD_FILTER, keywordFilter)
+        reloadServerList()
+    }
+
     private val mMsgReceiver = object : BroadcastReceiver() {
         override fun onReceive(ctx: Context?, intent: Intent?) {
             when (intent?.getIntExtra("key", 0)) {
@@ -350,11 +387,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 }
 
                 AppConfig.MSG_MEASURE_CONFIG_SUCCESS -> {
-                    val resultPair = intent.getSerializableExtra("content") as Pair<String, Long>
+                    val resultPair = intent.serializable<Pair<String, Long>>("content") ?: return
                     MmkvManager.encodeServerTestDelayMillis(resultPair.first, resultPair.second)
                     updateListAction.value = getPosition(resultPair.first)
                 }
             }
         }
     }
-}
+}

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

@@ -5,21 +5,13 @@ import android.content.SharedPreferences
 import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.preference.PreferenceManager
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 
 class SettingsViewModel(application: Application) : AndroidViewModel(application),
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private val settingsStorage by lazy {
-        MMKV.mmkvWithID(
-            MmkvManager.ID_SETTING,
-            MMKV.MULTI_PROCESS_MODE
-        )
-    }
-
     fun startListenPreferenceChange() {
         PreferenceManager.getDefaultSharedPreferences(getApplication())
             .registerOnSharedPreferenceChangeListener(this)
@@ -47,10 +39,6 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
             AppConfig.PREF_LANGUAGE,
             AppConfig.PREF_UI_MODE_NIGHT,
             AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
-            AppConfig.PREF_ROUTING_MODE,
-            AppConfig.PREF_V2RAY_ROUTING_AGENT,
-            AppConfig.PREF_V2RAY_ROUTING_BLOCKED,
-            AppConfig.PREF_V2RAY_ROUTING_DIRECT,
             AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL,
             AppConfig.PREF_FRAGMENT_PACKETS,
             AppConfig.PREF_FRAGMENT_LENGTH,
@@ -61,6 +49,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
             }
 
             AppConfig.PREF_ROUTE_ONLY_ENABLED,
+            AppConfig.PREF_IS_BOOTED,
             AppConfig.PREF_SPEED_ENABLED,
             AppConfig.PREF_PROXY_SHARING,
             AppConfig.PREF_LOCAL_DNS_ENABLED,

V2rayNG/app/src/main/res/drawable-night/ic_action_done.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
-            android:fillColor="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
-            android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_add_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_copy.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_delete_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_description_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_edit_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+    android:width="24dp"
-        android:height="24dp"
+    android:height="24dp"
-        android:viewportWidth="24.0"
+    android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
+    <path
-      android:pathData="M537,85.3A85.3,85.3 0,0 1,597.3 110.3L828.3,341.3A85.3,85.3 0,0 1,853.3 401.7L853.3,810.7a128,128 0,0 1,-128 128L298.7,938.7a128,128 0,0 1,-128 -128L170.7,213.3a128,128 0,0 1,128 -128zM537,170.7L298.7,170.7a42.7,42.7 0,0 0,-42.7 42.7v597.3a42.7,42.7 0,0 0,42.7 42.7h426.7a42.7,42.7 0,0 0,42.7 -42.7L768,401.7L537,170.7zM512,384a42.7,42.7 0,0 1,42.4 37.7L554.7,426.7v85.3h85.3a42.7,42.7 0,0 1,5 85L640,597.3h-85.3v85.3a42.7,42.7 0,0 1,-85 5L469.3,682.7v-85.3L384,597.3a42.7,42.7 0,0 1,-5 -85L384,512h85.3v-85.3a42.7,42.7 0,0 1,42.7 -42.7z"
+        android:pathData="M537,85.3A85.3,85.3 0,0 1,597.3 110.3L828.3,341.3A85.3,85.3 0,0 1,853.3 401.7L853.3,810.7a128,128 0,0 1,-128 128L298.7,938.7a128,128 0,0 1,-128 -128L170.7,213.3a128,128 0,0 1,128 -128zM537,170.7L298.7,170.7a42.7,42.7 0,0 0,-42.7 42.7v597.3a42.7,42.7 0,0 0,42.7 42.7h426.7a42.7,42.7 0,0 0,42.7 -42.7L768,401.7L537,170.7zM512,384a42.7,42.7 0,0 1,42.4 37.7L554.7,426.7v85.3h85.3a42.7,42.7 0,0 1,5 85L640,597.3h-85.3v85.3a42.7,42.7 0,0 1,-85 5L469.3,682.7v-85.3L384,597.3a42.7,42.7 0,0 1,-5 -85L384,512h85.3v-85.3a42.7,42.7 0,0 1,42.7 -42.7z"
-      android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF" />
 </vector>

V2rayNG/app/src/main/res/drawable-night/ic_lock_24dp.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M742.4,409.6L716.8,409.6L716.8,332.8C716.8,205.8 613.4,102.4 486.4,102.4S256,205.8 256,332.8L256,409.6h-25.6C188.1,409.6 153.6,444.1 153.6,486.4v409.6c0,42.3 34.5,76.8 76.8,76.8h512c42.3,0 76.8,-34.5 76.8,-76.8v-409.6c0,-42.3 -34.5,-76.8 -76.8,-76.8zM307.2,332.8C307.2,234 387.6,153.6 486.4,153.6S665.6,234 665.6,332.8L665.6,409.6L307.2,409.6L307.2,332.8zM768,896a25.6,25.6 0,0 1,-25.6 25.6h-512a25.6,25.6 0,0 1,-25.6 -25.6v-409.6a25.6,25.6 0,0 1,25.6 -25.6h512a25.6,25.6 0,0 1,25.6 25.6v409.6z" />
+
+</vector>

V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml

@@ -5,11 +5,11 @@
     android:viewportHeight="1024">
     <path
         android:pathData="M273.2,212.8h583.7L856.9,906.2h-583.7L273.2,212.8zM344.9,284.5L344.9,834.6h440.3L785.2,284.5h-440.3z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF" />
     <path
         android:pathData="M167.1,117.8h554.4v123.6h-71.7V189.4H238.8v498.8h73.9v71.7H167.1V117.8z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF" />
     <path
         android:pathData="M674.8,504H455.3v-71.7h219.4v71.7zM674.8,650.2H455.3v-71.7h219.4v71.7z"
-        android:fillColor="#FFFFFFFF"/>
+        android:fillColor="#FFFFFFFF" />
 </vector>