sdk28

up ver
ii
2019-07-10 14:24:09 +08:00 · 2019-07-01 13:22:48 +08:00 · 2019-05-15 10:17:59 +08:00
410 changed files with 12346 additions and 19504 deletions
@@ -1,34 +0,0 @@
---
-name: v2rayNG程序问题
-about: 创建一个报告来帮助我们改进
---
-
-在提出问题前请先自行排除服务器端问题，同时也请通过搜索确认是否有人提出过相同问题。
-
-
-### 预期行为
-描述你认为应该发生什么
-
-### 实际行为
-描述实际发生了什么
-
-### 复现方法
-1.
-2.
-3.
-
-### 日志信息
-<details>
-
-通过`adb logcat -s com.v2ray.ang GoLog V2rayConfigUtilGoLog Main`获取日志。请自行删减日志中可能出现的敏感信息。
-
-如果问题可重现，建议先执行`adb logcat -c`清空系统日志再执行上述命令，再操作重现问题。
-```
-在这里粘贴日志
-```
-</details>
-
-### 环境信息
-
-### 额外信息（可选）
-
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: V2Ray程序问题
-    url: https://github.com/v2fly/v2ray-core/
-    about: 如果您有V2Ray而非v2rayNG的问题，请至这个链接讨论。
@@ -1,93 +0,0 @@
-name: Build APK
-
-on:
-  push:
-  workflow_dispatch:
-    inputs:
-      XRAY_CORE_VERSION:
-        description: 'Xray core version or commit hash'
-        required: false
-
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: '21'
-
-    - name: Setup Golang
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.23.2'
-        cache: false
-
-    - name: Patch Go use 600296
-      #https://go-review.googlesource.com/c/go/+/600296
-      run: |
-        cd "$(go env GOROOT)"
-        curl "https://go-review.googlesource.com/changes/go~600296/revisions/5/patch" | base64 -d | patch --verbose -p 1
-
-    - name: Install gomobile
-      run: |
-        go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20240806205939-81131f6468ab
-        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-
-    - name: Setup Android environment
-      uses: android-actions/setup-android@v3
-
-    - name: Build dependencies
-      run: |
-        mkdir ${{ github.workspace }}/build
-        cd ${{ github.workspace }}/build
-        git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git
-        cd AndroidLibXrayLite
-        go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true
-        gomobile init
-        go mod tidy -v
-        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
-        cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/
-
-    - name: Build APK
-      run: |
-        cd ${{ github.workspace }}/V2rayNG
-        chmod 755 gradlew
-        ./gradlew assembleDebug
-
-    - name: Upload arm64-v8a APK
-      uses: actions/upload-artifact@v4
-      if: ${{  success() }}
-      with:
-        name: arm64-v8a
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk
-
-    - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4
-      if: ${{  success() }}
-      with:
-        name: armeabi-v7a
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk
-
-    - name: Upload x86 APK
-      uses: actions/upload-artifact@v4
-      if: ${{  success() }}
-      with:
-        name: x86-apk
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk
-    
-    - name: Upload Other APKs
-      uses: actions/upload-artifact@v4
-      with:
-        name: others-apk
-        path: |
-          ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk
@@ -1,5 +1,12 @@
+V2rayNG/app/src/main/res/layout/activity_inapp_buy.xml
+V2rayNG/app/src/main/assets/geoip.dat
+V2rayNG/app/src/main/assets/geosite.dat
+V2rayNG/app/src/main/java/com/v2ray/ang/InappBuyActivity.java
+V2rayNG/gradle/wrapper/gradle-wrapper.properties
+V2rayNG/gradle/wrapper/gradle-wrapper.properties
+*.aar
 *.dat
 *.jks
-V2rayNG/app/release/output.json
-.idea/
-.gradle/
+V2rayNG/gradle/wrapper/gradle-wrapper.properties
+V2rayNG/gradle/wrapper/gradle-wrapper.properties
+V2rayNG/app/release/output.json
@@ -1,20 +0,0 @@
-# AndroidLibV2rayLite
-
-### Preparation
- latest Ubuntu environment
- At lease 30G free space
- Get Repo [AndroidLibV2rayLite](https://github.com/2dust/AndroidLibV2rayLite) or [AndroidLibXrayLite](https://github.com/2dust/AndroidLibXrayLite)
-### Prepare Go
- Go to https://golang.org/doc/install and install latest go
- Make sure `go version` works as expected
-### Prepare gomobile
- Go to https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile and install gomobile
- export PATH=$PATH:~/go/bin
- Make sure `gomobile init` works as expected
-### Prepare NDK
- Go to https://developer.android.com/ndk/downloads and install latest NDK
- export PATH=$PATH:<wherever you ndk is located>
- Make sure `ndk-build -v` works as expected
-### Make
- sudo apt install make
- Read and understand [build script](https://github.com/2dust/AndroidLibV2rayLite/blob/master/Makefile)
@@ -1,40 +1,29 @@
-**v2rayNG 隐私权政策**
+v2rayNG 隐私条款

-本政策自2023年11月17日起施行
+最后更新 2017-11-22

-2dust 将 v2rayNG 应用程序构建为开源应用程序。 本服务由 2dust 免费提供，并且旨在按原样使用。
+v2rayNG 尊重并保护所有用户的个人隐私权，为此我们向大众公开这份隐私条款。**您使用 v2rayNG 即代表您以阅读并同意了这份条款，如果您不同意这份条款请立即停止使用并卸载 v2rayNG。**

-v2rayNG 尊重并保护所有用户的个人隐私权，为此我们向大众公开这份隐私权政策。**您使用 v2rayNG 即代表您以阅读并同意了这份条款，如果您不同意这份条款请立即停止使用并卸载 v2rayNG。**
+1. 信息收集

-**信息收集**
+	v2rayNG 软件自身不会发送任何信息到开发者，但是您下载软件的应用市场（如 Google Play）可能会收集关于应用运行状态的相关信息并提供给 v2rayNG 开发者。有关这些信息，请阅读您使用的应用市场所提供的隐私条款。

-v2rayNG 软件自身不会发送任何信息到开发者，但是您下载软件的应用市场（如 Google Play）可能会收集关于应用运行状态的相关信息并提供给 v2rayNG 开发者。有关这些信息，请阅读您使用的应用市场所提供的隐私权政策。
+	v2rayNG 软件中可能包含需要通过 IAP 支付解锁的功能，您的支付信息将由相关的 IAP 渠道进行处理，而我们对支付信息没有访问权。

-v2rayNG 软件中可能包含需要通过 IAP 支付解锁的功能，您的支付信息将由相关的 IAP 渠道进行处理，而我们对支付信息没有访问权。
+	当您向 v2rayNG 开发者反馈软件运行中的错误时，开发者可能会要求您提供软件以及系统的日志以帮助确认问题的原因。因日志中可能包括敏感信息，此类信息只能由您自己操作发送。**我们不对任何传输服务的安全性和隐私性做任何明示或暗示的担保，请您在传送相关信息时选择可以您自身可以接受的方式。**

-当您向 v2rayNG 开发者反馈软件运行中的错误时，开发者可能会要求您提供软件以及系统的日志以帮助确认问题的原因。因日志中可能包括敏感信息，此类信息只能由您自己操作发送。**我们不对任何传输服务的安全性和隐私性做任何明示或暗示的担保，请您在传送相关信息时选择可以您自身可以接受的方式。**
+2. 信息共享

-**信息共享**
+	我们不会向任何第三方出售收集到的用户数据。我们可能向外部开发者提供信息以协助软件的开发，但是在提供信息之前我们会传达相关保密义务并确定其可以遵守。

-我们不会向任何第三方出售收集到的用户数据。我们可能向外部开发者提供信息以协助软件的开发，但是在提供信息之前我们会传达相关保密义务并确定其可以遵守。
+3. 信息存留

-**信息存留**
+	除非有相关法律规定，我们会在 30 天内清除不需要继续使用的用户数据，或将统计数据整合为无法识别单个用户的综合报告。

-除非有相关法律规定，我们会在 30 天内清除不需要继续使用的用户数据，或将统计数据整合为无法识别单个用户的综合报告。
+4. 信息泄露

-**信息泄露**
+	我们会使用合理的技术和安全手段尽力保护用户的数据，但是无法保证数据的绝对安全。如果我们确认数据发生了泄露，我们会在 7 天内通过可用的渠道通知用户。**您同意不向我们追责任何因不可抗力而造成的损失。**

-我们会使用合理的技术和安全手段尽力保护用户的数据，但是无法保证数据的绝对安全。如果我们确认数据发生了泄露，我们会在 7 天内通过可用的渠道通知用户。**您同意不向我们追责任何因不可抗力而造成的损失。**
-
-**儿童隐私**
-
-这些服务不针对 13 岁以下的任何人。我不会故意收集 13 岁以下儿童的个人身份信息。 如果我发现 13 岁以下的儿童向我提供了个人信息，我会立即从我们的服务器中删除该信息。 如果您是父母或监护人，并且您知道您的孩子向我们提供了个人信息，请与我联系，以便我能够采取必要的行动。
-
-**条款修改**
-
-我们保留修改这份隐私权政策的权利，但是会确保在更新条款前至少 30 天通过我们的可用渠道和应用内提示来通知用户。**在新条款生效后继续使用软件即表示您同意修改后的隐私权政策。**
-
-**联系我们**
-
-如果您对我的隐私政策有任何疑问或建议，请随时通过 CaptainIronng@protonmail.com 与我联系。
+5. 条款修改

+	我们保留修改这份隐私条款的权利，但是会确保在更新条款前至少 30 天通过我们的可用渠道和应用内提示来通知用户。**在新条款生效后继续使用软件即表示您同意修改后的隐私条款。**
@@ -1,36 +1,6 @@
 # v2rayNG

-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-2.1.0-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)
-[![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
-
 <a href="https://play.google.com/store/apps/details?id=com.v2ray.ang">
 <img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
 </a>

-### Telegram Channel
-[github_2dust](https://t.me/github_2dust)
-
-### Usage
-
-#### Geoip and Geosite
- geoip.dat and geosite.dat files are in `Android/data/com.v2ray.ang/files/assets` (path may differ on some Android device)
- download feature will get enhanced version in this [repo](https://github.com/Loyalsoldier/v2ray-rules-dat) (Note it need a working proxy)
- latest official [domain list](https://github.com/v2fly/domain-list-community) and [ip list](https://github.com/v2fly/geoip) can be imported manually
- possible to use third party dat file in the same folder, like [h2y](https://guide.v2fly.org/routing/sitedata.html#%E5%A4%96%E7%BD%AE%E7%9A%84%E5%9F%9F%E5%90%8D%E6%96%87%E4%BB%B6)
-
-### More in our [wiki](https://github.com/2dust/v2rayNG/wiki)
-
-### Development guide
-
-Android project under V2rayNG folder can be compiled directly in Android Studio, or using Gradle wrapper. But the v2ray core inside the aar is (probably) outdated.  
-The aar can be compiled from the Golang project [AndroidLibV2rayLite](https://github.com/2dust/AndroidLibV2rayLite) or [AndroidLibXrayLite](https://github.com/2dust/AndroidLibXrayLite).
-For a quick start, read guide for [Go Mobile](https://github.com/golang/go/wiki/Mobile) and [Makefiles for Go Developers](https://tutorialedge.net/golang/makefiles-for-go-developers/)
-
-v2rayNG can run on Android Emulators. For WSA, VPN permission need to be granted via
-`appops set [package name] ACTIVATE_VPN allow`
@@ -7,4 +7,3 @@
 /captures
 *.apk
 signing.properties
-*.aar
@@ -0,0 +1,129 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+
+    compileOptions {
+        targetCompatibility = "8"
+        sourceCompatibility = "8"
+    }
+
+    defaultConfig {
+        applicationId "com.v2ray.ang"
+        minSdkVersion 17
+        targetSdkVersion Integer.parseInt("$targetSdkVer")
+        multiDexEnabled true
+        versionCode 212
+        versionName "1.0.2"
+    }
+
+    signingConfigs {
+        release {
+            storeFile file("../key.jks")
+            keyAlias 'ang'
+            keyPassword '123456'
+            storePassword '123456'
+        }
+        debug {
+            storeFile file("../key.jks")
+            keyAlias 'ang'
+            keyPassword '123456'
+            storePassword '123456'
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
+            signingConfig signingConfigs.release
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
+            signingConfig signingConfigs.release
+        }
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' //select ABIs to build APKs for
+            universalApk true //generate an additional APK that contains all the ABIs
+        }
+    }
+
+    // map for the version code
+    project.ext.versionCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
+
+    android.applicationVariants.all { variant ->
+        // assign different version code for each output
+        variant.outputs.each { output ->
+            output.versionCodeOverride =
+                    project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI), 0) *
+                            1000000 + android.defaultConfig.versionCode
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':dpreference')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+    // Android support library
+    implementation "com.android.support:support-v4:$supportLibVersion"
+    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation "com.android.support:design:$supportLibVersion"
+    implementation "com.android.support:cardview-v7:$supportLibVersion"
+    implementation "com.android.support:preference-v7:$supportLibVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    // DSL
+    implementation "org.jetbrains.anko:anko-sdk15:$ankoVersion"
+    implementation "org.jetbrains.anko:anko-support-v4:$ankoVersion"
+    implementation "org.jetbrains.anko:anko-appcompat-v7:$ankoVersion"
+    implementation "org.jetbrains.anko:anko-design:$ankoVersion"
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'io.reactivex:rxjava:1.3.4'
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
+    implementation 'com.dinuscxj:recycleritemdecoration:1.0.0'
+    implementation 'io.reactivex:rxkotlin:0.60.0'
+    implementation 'me.dm7.barcodescanner:core:1.9.8'
+    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
+    implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
+    implementation 'com.beust:klaxon:3.0.1'
+    implementation 'com.android.support:multidex:1.0.3'
+
+    implementation(name: 'libv2ray', ext: 'aar')
+    //implementation(name: 'tun2socks', ext: 'aar')
+}
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://maven.google.com' }
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
+    }
+}
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
@@ -1,151 +0,0 @@
-plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    id("com.google.android.gms.oss-licenses-plugin")
-}
-
-android {
-    namespace = "com.v2ray.ang"
-    compileSdk = 35
-
-    defaultConfig {
-        applicationId = "com.v2ray.ang"
-        minSdk = 21
-        targetSdk = 35
-        versionCode = 618
-        versionName = "1.9.22"
-        multiDexEnabled = true
-
-        splits {
-            abi {
-                isEnable = true
-                include(
-                    "arm64-v8a",
-                    "armeabi-v7a",
-                    "x86_64",
-                    "x86"
-                )
-                isUniversalApk = true
-            }
-        }
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    sourceSets {
-        getByName("main") {
-            jniLibs.srcDirs("libs")
-        }
-    }
-
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
-    }
-
-    applicationVariants.all {
-        val variant = this
-        val versionCodes =
-            mapOf("armeabi-v7a" to 4, "arm64-v8a" to 4, "x86" to 4, "x86_64" to 4, "universal" to 4)
-
-        variant.outputs
-            .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
-            .forEach { output ->
-                val abi = if (output.getFilter("ABI") != null)
-                    output.getFilter("ABI")
-                else
-                    "universal"
-
-                output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk"
-                if (versionCodes.containsKey(abi)) {
-                    output.versionCodeOverride =
-                        (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
-                } else {
-                    return@forEach
-                }
-            }
-    }
-
-    buildFeatures {
-        viewBinding = true
-        buildConfig = true
-    }
-
-    packaging {
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
-
-}
-
-dependencies {
-    // Core Libraries
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar", "*.jar"))))
-
-    // AndroidX Core Libraries
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.activity)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.preference.ktx)
-    implementation(libs.recyclerview)
-
-    // UI Libraries
-    implementation(libs.material)
-    implementation(libs.toastcompat)
-    implementation(libs.editorkit)
-    implementation(libs.flexbox)
-
-    // Data and Storage Libraries
-    implementation(libs.mmkv.static)
-    implementation(libs.gson)
-
-    // Reactive and Utility Libraries
-    implementation(libs.rxjava)
-    implementation(libs.rxandroid)
-    implementation(libs.rxpermissions)
-
-    // Language and Processing Libraries
-    implementation(libs.language.base)
-    implementation(libs.language.json)
-
-    // Intent and Utility Libraries
-    implementation(libs.quickie.bundled)
-    implementation(libs.core)
-
-    // AndroidX Lifecycle and Architecture Components
-    implementation(libs.lifecycle.viewmodel.ktx)
-    implementation(libs.lifecycle.livedata.ktx)
-    implementation(libs.lifecycle.runtime.ktx)
-
-    // Background Task Libraries
-    implementation(libs.work.runtime.ktx)
-    implementation(libs.work.multiprocess)
-
-    // Multidex Support
-    implementation(libs.multidex)
-
-    // Testing Libraries
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    testImplementation(libs.org.mockito.mockito.inline)
-    testImplementation(libs.mockito.kotlin)
-    // Oss Licenses
-    implementation(libs.play.services.oss.licenses)
-}
@@ -1,10 +1,14 @@
 # Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# By default, the flags in this file are appended to flags specified
+# in G:\android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

+# Add any project specific keep options here:
+
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
@@ -12,10 +16,46 @@
 #   public *;
 #}

-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature

-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+
+-dontwarn org.apache.commons.**
+-keep class org.apache.commons.** { *;}
+
+# Disable debug info output
+-assumenosideeffects class android.util.Log {
+    public static boolean isLoggable(java.lang.String,int);
+    public static int v(...);
+    public static int i(...);
+    public static int w(...);
+    public static int d(...);
+    public static int e(...);
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+    static void checkExpressionValueIsNotNull(java.lang.Object, java.lang.String);
+    static void throwUninitializedPropertyAccessException(java.lang.String);
+}
+
+-dontwarn org.jetbrains.anko.internals.**
+-keep class org.jetbrains.anko.internals.** { *;}
+
+-dontwarn rx.internal.util.unsafe.**
+-keep class rx.internal.util.unsafe.** { *;}
+
+-dontwarn app.dinus.**
+-keep class app.dinus.** { *;}
+
+-keepclassmembers class ** {
+    @com.hwangjr.rxbus.annotation.Subscribe public *;
+    @com.hwangjr.rxbus.annotation.Produce public *;
+}
+
+-keep class libv2ray.** { *;}
@@ -0,0 +1,13 @@
+package com.v2ray.ang;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="app_name" type="string">v2rayNG (DEV)</item>
-</resources>
@@ -1,72 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="MissingLeanbackLauncher">
+    package="com.v2ray.ang">

-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        tools:overrideLibrary="com.blacksquircle.ui.editorkit" />
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        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"
-        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.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!-- <useapplications-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
+    <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="com.android.vending.BILLING" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        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.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
    <application
        android:name=".AngApplication"
        android:allowBackup="true"
-        android:banner="@mipmap/ic_banner"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
-        android:theme="@style/AppThemeDayNight"
-        android:usesCleartextTraffic="true"
-        tools:targetApi="m">
-
+        android:theme="@style/AppTheme">
        <activity
            android:name=".ui.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:theme="@style/AppThemeDayNight.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:launchMode="singleTask">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <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.service.quicksettings.action.QS_TILE_PREFERENCES" />
@@ -78,81 +44,34 @@
        </activity>
        <activity
            android:name=".ui.ServerActivity"
-            android:exported="false"
            android:windowSoftInputMode="stateUnchanged" />
        <activity
-            android:name=".ui.ServerCustomConfigActivity"
-            android:exported="false"
+            android:name=".ui.Server2Activity"
            android:windowSoftInputMode="stateUnchanged" />
        <activity
-            android:name=".ui.SettingsActivity"
-            android:exported="false" />
+            android:name=".ui.Server3Activity"
+            android:windowSoftInputMode="stateUnchanged" />
        <activity
-            android:name=".ui.PerAppProxyActivity"
-            android:exported="false" />
+            android:name=".ui.Server4Activity"
+            android:windowSoftInputMode="stateUnchanged" />
+        <activity android:name=".ui.SettingsActivity" />
+        <activity android:name=".ui.PerAppProxyActivity" />
+        <activity android:name=".ui.ScannerActivity" />
+        <activity android:name=".InappBuyActivity" />
+        <activity android:name=".ui.LogcatActivity" />
        <activity
-            android:name=".ui.ScannerActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.LogcatActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.RoutingSettingActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.RoutingEditActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.SubSettingActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.UserAssetActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.UserAssetUrlActivity"
-            android:exported="false" />
+            android:name=".ui.RoutingSettingsActivity"
+            android:windowSoftInputMode="stateUnchanged" />
+        <activity android:name=".ui.SubSettingActivity" />

-        <activity
-            android:name=".ui.SubEditActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.ScScannerActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.ScSwitchActivity"
-            android:excludeFromRecents="true"
-            android:exported="false"
-            android:process=":RunSoLibV2RayDaemon"
-            android:theme="@style/AppTheme.NoActionBar.Translucent" />
-
-        <activity
-            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" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="v2rayng" />
-                <data android:host="install-config" />
-                <data android:host="install-sub" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.AboutActivity"
-            android:exported="false" />
+        <activity android:name=".ui.SubEditActivity" />
+        <activity android:name=".ui.ScScannerActivity" />
+        <activity android:name=".ui.ScSwitchActivity" />

        <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:process=":RunSoLibV2RayDaemon">
@@ -162,107 +81,45 @@
            <meta-data
                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
                android:value="true" />
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="vpn" />
        </service>

-        <service
-            android:name=".service.V2RayProxyOnlyService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse"
-            android:label="@string/app_name"
-            android:process=":RunSoLibV2RayDaemon">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="proxy" />
-        </service>
+        <!--<receiver android:name=".receiver.WidgetProvider">-->
+        <!--<meta-data-->
+        <!--android:name="android.appwidget.provider"-->
+        <!--android:resource="@xml/app_widget_provider" />-->

-        <service
-            android:name=".service.V2RayTestService"
-            android:exported="false"
-            android:process=":RunSoLibV2RayDaemon" />
-
-        <receiver
-            android:name=".receiver.WidgetProvider"
-            android:exported="true"
-            android:process=":RunSoLibV2RayDaemon">
-            <meta-data
-                android:name="android.appwidget.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>
+        <!--<intent-filter>-->
+        <!--<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />-->
+        <!--<action android:name="com.v2ray.ang.action.widget.click" />-->
+        <!--</intent-filter>-->
+        <!--</receiver>-->

        <service
            android:name=".service.QSTileService"
-            android:exported="true"
-            android:foregroundServiceType="specialUse"
-            android:icon="@drawable/ic_stat_name"
+            android:icon="@drawable/ic_v"
            android:label="@string/app_tile_name"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:process=":RunSoLibV2RayDaemon">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
                <action android:name="android.service.quicksettings.action.QS_TILE" />
            </intent-filter>
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="tile" />
        </service>
        <!-- =====================Tasker===================== -->
        <activity
            android:name=".ui.TaskerActivity"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher">
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name">
            <intent-filter>
                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
            </intent-filter>
        </activity>

-        <receiver
-            android:name=".receiver.TaskerReceiver"
-            android:exported="true"
-            android:process=":RunSoLibV2RayDaemon"
-            tools:ignore="ExportedReceiver">
+        <receiver android:name=".receiver.TaskerReceiver">
            <intent-filter>
                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
            </intent-filter>
        </receiver>
        <!-- =====================Tasker===================== -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-
-        </provider>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.cache"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/cache_paths" />
-        </provider>

    </application>

-</manifest>
+</manifest>
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * 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.android.vending.billing;
+
+import android.os.Bundle;
+
+/**
+ * InAppBillingService is the service that provides in-app billing version 3 and beyond.
+ * This service provides the following features:
+ * 1. Provides a new API to get details of in-app items published for the app including
+ *    price, type, title and description.
+ * 2. The purchase flow is synchronous and purchase information is available immediately
+ *    after it completes.
+ * 3. Purchase information of in-app purchases is maintained within the Google Play system
+ *    till the purchase is consumed.
+ * 4. An API to consume a purchase of an inapp item. All purchases of one-time
+ *    in-app items are consumable and thereafter can be purchased again.
+ * 5. An API to get current purchases of the user immediately. This will not contain any
+ *    consumed purchases.
+ *
+ * All calls will give a response code with the following possible values
+ * RESULT_OK = 0 - success
+ * RESULT_USER_CANCELED = 1 - user pressed back or canceled a dialog
+ * RESULT_BILLING_UNAVAILABLE = 3 - this billing API version is not supported for the type requested
+ * RESULT_ITEM_UNAVAILABLE = 4 - requested SKU is not available for purchase
+ * RESULT_DEVELOPER_ERROR = 5 - invalid arguments provided to the API
+ * RESULT_ERROR = 6 - Fatal error during the API action
+ * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
+ * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
+ */
+interface IInAppBillingService {
+    /**
+     * Checks support for the requested billing API version, package and in-app type.
+     * Minimum API version supported by this interface is 3.
+     * @param apiVersion the billing version which the app is using
+     * @param packageName the package name of the calling app
+     * @param type type of the in-app item being purchased "inapp" for one-time purchases
+     *        and "subs" for subscription.
+     * @return RESULT_OK(0) on success, corresponding result code on failures
+     */
+    int isBillingSupported(int apiVersion, String packageName, String type);
+
+    /**
+     * Provides details of a list of SKUs
+     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
+     * with a list JSON strings containing the productId, price, title and description.
+     * This API can be called with a maximum of 20 SKUs.
+     * @param apiVersion billing API version that the Third-party is using
+     * @param packageName the package name of the calling app
+     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "DETAILS_LIST" with a StringArrayList containing purchase information
+     *              in JSON format similar to:
+     *              '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
+     *                 "title : "Example Title", "description" : "This is an example description" }'
+     */
+    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
+
+    /**
+     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
+     * the type, a unique purchase token and an optional developer payload.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param sku the SKU of the in-app item as published in the developer console
+     * @param type the type of the in-app item ("inapp" for one-time purchases
+     *        and "subs" for subscription).
+     * @param developerPayload optional argument to be sent back with the purchase information
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "BUY_INTENT" - PendingIntent to start the purchase flow
+     *
+     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
+     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
+     * If the purchase is successful, the result data will contain the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
+     *              '{"orderId":"12999763169054705758.1371079406387615",
+     *                "packageName":"com.example.app",
+     *                "productId":"exampleSku",
+     *                "purchaseTime":1345678900000,
+     *                "purchaseToken" : "122333444455555",
+     *                "developerPayload":"example developer payload" }'
+     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
+     *                                  was signed with the private key of the developer
+     *                                  TODO: change this to app-specific keys.
+     */
+    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
+        String developerPayload);
+
+    /**
+     * Returns the current SKUs owned by the user of the type and package name specified along with
+     * purchase information and a signature of the data to be validated.
+     * This will return all SKUs that have been purchased in V3 and managed items purchased using
+     * V1 and V2 that have not been consumed.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param type the type of the in-app items being requested
+     *        ("inapp" for one-time purchases and "subs" for subscription).
+     * @param continuationToken to be set as null for the first call, if the number of owned
+     *        skus are too many, a continuationToken is returned in the response bundle.
+     *        This method can be called again with the continuation token to get the next set of
+     *        owned skus.
+     * @return Bundle containing the following key-value pairs
+     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
+     *              failure as listed above.
+     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
+     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
+     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
+     *                                      of the purchase information
+     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
+     *                                      next set of in-app purchases. Only set if the
+     *                                      user has more owned skus than the current list.
+     */
+    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
+
+    /**
+     * Consume the last purchase of the given SKU. This will result in this item being removed
+     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
+     * @param apiVersion billing API version that the app is using
+     * @param packageName package name of the calling app
+     * @param purchaseToken token in the purchase information JSON that identifies the purchase
+     *        to be consumed
+     * @return 0 if consumption succeeded. Appropriate error values for failures.
+     */
+    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
+}
@@ -1,149 +0,0 @@
-[
-  {
-    "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": "代理海外公共DNSIP",
-    "outboundTag": "proxy",
-    "ip": [
-      "1.1.1.1",
-      "1.0.0.1",
-      "2606:4700:4700::1111",
-      "2606:4700:4700::1001",
-      "1.1.1.2",
-      "1.0.0.2",
-      "2606:4700:4700::1112",
-      "2606:4700:4700::1002",
-      "1.1.1.3",
-      "1.0.0.3",
-      "2606:4700:4700::1113",
-      "2606:4700:4700::1003",
-      "8.8.8.8",
-      "8.8.4.4",
-      "2001:4860:4860::8888",
-      "2001:4860:4860::8844",
-      "94.140.14.14",
-      "94.140.15.15",
-      "2a10:50c0::ad1:ff",
-      "2a10:50c0::ad2:ff",
-      "94.140.14.15",
-      "94.140.15.16",
-      "2a10:50c0::bad1:ff",
-      "2a10:50c0::bad2:ff",
-      "94.140.14.140",
-      "94.140.14.141",
-      "2a10:50c0::1:ff",
-      "2a10:50c0::2:ff",
-      "208.67.222.222",
-      "208.67.220.220",
-      "2620:119:35::35",
-      "2620:119:53::53",
-      "208.67.222.123",
-      "208.67.220.123",
-      "2620:119:35::123",
-      "2620:119:53::123",
-      "9.9.9.9",
-      "149.112.112.112",
-      "2620:fe::9",
-      "2620:fe::fe",
-      "9.9.9.11",
-      "149.112.112.11",
-      "2620:fe::11",
-      "2620:fe::fe:11",
-      "9.9.9.10",
-      "149.112.112.10",
-      "2620:fe::10",
-      "2620:fe::fe:10",
-      "77.88.8.8",
-      "77.88.8.1",
-      "2a02:6b8::feed:0ff",
-      "2a02:6b8:0:1::feed:0ff",
-      "77.88.8.88",
-      "77.88.8.2",
-      "2a02:6b8::feed:bad",
-      "2a02:6b8:0:1::feed:bad",
-      "77.88.8.7",
-      "77.88.8.3",
-      "2a02:6b8::feed:a11",
-      "2a02:6b8:0:1::feed:a11"
-    ]
-  },
-  {
-    "remarks": "代理海外公共DNS域名",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:cloudflare-dns.com",
-      "domain:one.one.one.one",
-      "domain:dns.google",
-      "domain:adguard-dns.com",
-      "domain:opendns.com",
-      "domain:umbrella.com",
-      "domain:quad9.net",
-      "domain:yandex.net"
-    ]
-  },
-  {
-    "remarks": "代理IP",
-    "outboundTag": "proxy",
-    "ip": [
-      "geoip:facebook",
-      "geoip:fastly",
-      "geoip:google",
-      "geoip:netflix",
-      "geoip:telegram",
-      "geoip:twitter"
-    ]
-  },
-  {
-    "remarks": "代理GFW",
-    "outboundTag": "proxy",
-    "domain": [
-      "geosite:gfw",
-      "geosite:greatfire"
-    ]
-  },
-  {
-    "remarks": "最终直连",
-    "port": "0-65535",
-    "outboundTag": "direct"
-  }
-]
@@ -1,34 +0,0 @@
-[
-  {
-    "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"
-  }
-]
@@ -1,108 +0,0 @@
-[
-  {
-    "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": "绕过中国公共DNSIP",
-    "outboundTag": "direct",
-    "ip": [
-      "223.5.5.5",
-      "223.6.6.6",
-      "2400:3200::1",
-      "2400:3200:baba::1",
-      "119.29.29.29",
-      "1.12.12.12",
-      "120.53.53.53",
-      "2402:4e00::",
-      "2402:4e00:1::",
-      "180.76.76.76",
-      "2400:da00::6666",
-      "114.114.114.114",
-      "114.114.115.115",
-      "114.114.114.119",
-      "114.114.115.119",
-      "114.114.114.110",
-      "114.114.115.110",
-      "180.184.1.1",
-      "180.184.2.2",
-      "101.226.4.6",
-      "218.30.118.6",
-      "123.125.81.6",
-      "140.207.198.6",
-      "1.2.4.8",
-      "210.2.4.8",
-      "52.80.66.66",
-      "117.50.22.22",
-      "2400:7fc0:849e:200::4",
-      "2404:c2c0:85d8:901::4",
-      "117.50.10.10",
-      "52.80.52.52",
-      "2400:7fc0:849e:200::8",
-      "2404:c2c0:85d8:901::8",
-      "117.50.60.30",
-      "52.80.60.30"
-    ]
-  },
-  {
-    "remarks": "绕过中国公共DNS域名",
-    "outboundTag": "direct",
-    "domain": [
-      "domain:alidns.com",
-      "domain:doh.pub",
-      "domain:dot.pub",
-      "domain:360.cn",
-      "domain:onedns.net"
-    ]
-  },
-  {
-    "remarks": "绕过中国IP",
-    "outboundTag": "direct",
-    "ip": [
-      "geoip:cn"
-    ]
-  },
-  {
-    "remarks": "绕过中国域名",
-    "outboundTag": "direct",
-    "domain": [
-      "geosite:cn"
-    ]
-  },
-  {
-    "remarks": "最终代理",
-    "port": "0-65535",
-    "outboundTag": "proxy"
-  }
-]
@@ -1,49 +0,0 @@
-[
-  {
-    "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"
-  }
-]
@@ -1,241 +1,196 @@
-amanita_design.samorost3.gp
-android
-au.com.shiftyjelly.pocketcasts
-bbc.mobile.news.ww
-be.mygod.vpnhotspot
-ch.protonmail.android
-co.wanqu.android
-com.alphainventor.filemanager
-com.amazon.kindle
-com.amazon.mshop.android.shopping
 com.android.chrome
-com.android.providers.downloads
-com.android.providers.downloads.ui
-com.android.providers.telephony
-com.android.settings
-com.android.vending
-com.android6park.m6park
-com.apkpure.aegon
-com.apkupdater
-com.app.pornhub
-com.arthurivanets.owly
-com.asahi.tida.tablet
-com.authy.authy
-com.avmovie
-com.ballistiq.artstation
-com.binance.dev
-com.bitly.app
-com.brave.browser
-com.brave.browser_beta
-com.breel.wallpapers18
-com.bvanced.android.youtube
-com.chrome.beta
-com.chrome.canary
-com.chrome.dev
-com.cl.newt66y
-com.cradle.iitc_mobile
-com.cygames.shadowverse
-com.devhd.feedly
-com.devolver.reigns2
-com.discord
-com.downloader.video.tumblr
-com.driverbrowser
-com.dropbox.android
-com.duolingo
-com.duckduckgo.mobile.android
-com.dv.adm
-com.estrongs.android.pop
-com.estrongs.android.pop.pro
-com.evernote
-com.facebook.katana
-com.facebook.lite
-com.facebook.mlite
-com.facebook.orca
-com.facebook.services
-com.facebook.system
-com.fastaccess.github
-com.felixfilip.scpae
-com.fireproofstudios.theroom4
-com.firstrowria.pushnotificationtester
-com.flyersoft.moonreaderp
-com.fooview.android.fooview
-com.fvd.eversync
-com.gameloft.android.anmp.glofta8hm
-com.gameloft.android.anmp.glofta9hm
-com.gianlu.aria2app
-com.github.yeriomin.yalpstore
-com.google.android.apps.adm
-com.google.android.apps.books
-com.google.android.apps.docs
-com.google.android.apps.docs.editors.sheets
-com.google.android.apps.fitness
-com.google.android.apps.googleassistant
-com.google.android.apps.googlevoice
-com.google.android.apps.hangoutsdialer
-com.google.android.apps.inbox
-com.google.android.apps.magazines
-com.google.android.apps.maps
-com.google.android.apps.nbu.files
-com.google.android.apps.paidtasks
-com.google.android.apps.pdfviewer
-com.google.android.apps.photos
-com.google.android.apps.plus
-com.google.android.apps.translate
-com.google.android.gm
-com.google.android.gms
-com.google.android.gms.setup
 com.google.android.googlequicksearchbox
+com.google.android.apps.photos
+com.google.android.youtube
+com.google.android.gm
+com.google.android.apps.plus
+com.android.vending
+com.google.android.inputmethod.latin
+com.google.android.apps.paidtasks
+com.google.android.keep
+com.google.android.gms.setup
+com. google.android. apps.magazines
+com.google.android.videos
+com. google.android.gms
+com.google.android.apps.books
+com.google.android.music
+com.google.android.play.games
 com.google.android.gsf
 com.google.android.gsf.login
+com.app.pornhub
+com.spotify.music
+org.thunderdog.challegram
+com.tumblr
+com.twitter.android
+com.xda.labs
+com.kapp.youtube.final
 com.google.android.ims
-com.google.android.inputmethod.latin
+com.wire
+mark.via.gp
+com.downloader.video.tumblr
+com.sololearn
+com.cygames.shadowverse
+com.felixfilip.scpae
+amanita_design.samorost3.gp
+com.devolver.reigns2
+com.utopia.pxview
+ch.protonmail.android
+com.perol.asdpl.pixivez
+com.pinterest
+com.paypal.android.p2pmobile
+com.arthurivanets.owly
+com.rubenmayayo.reddit
+com.rayark.cytus2
+com.rayark.pluto
+com.rayark.implosion
+com.fireproofstudios.theroom4
+com.netflix.mediaclient
+com.instagram.android
+com.google.android.apps.hangoutsdialer
+com.google.android.talk
+com.google.android.apps.plus
+com.google.android.apps.pdfviewer
+com.google.android.apps.magazines
+com.google.android.apps.nbu.files
+com.evernote
+net.tsapps.appsales
+com.google.android.apps.translate
+com.google.ar.lens
+com.google.android.apps.adm
+com.google.android.apps.googleassistant
+tw.com.gamer.android.activecenter
+org.telegram.plus
+com.brave.browser
+com.breel.wallpapers18
+com.teslacoilsw.launcher
+com.lastpass.lpandroid
+org.kustom.widget
+com.fooview.android.fooview
+com.google.android.apps.docs
+com.google.android.apps.maps
+com.facebook.services
+com.facebook.system
+com.facebook.katana
+com.nianticlabs.ingress.prime.qa
+com.vanced.android.youtube
+com.nianticproject.ingress
+com.quoord.tapatalkpro.activity
+org.mozilla.firefox
+com.reddit.frontpage
+com.google.android.apps.fitness
+au.com.shiftyjelly.pocketcasts
+com.google.android.gms
+com.android.providers.telephony
+com.resilio.sync
+com.google.android.apps.googlevoice
+com.discord
+com.cradle.iitc_mobile
+be.mygod.vpnhotspot
+com.alphainventor.filemanager
+com.android.providers.downloads
+com.apkpure.aegon
+com.ballistiq.artstation
+com.bitly.app
+com.chrome.canary
+com.chrome.dev
+com.devhd.feedly
+com.dropbox.android
+com.estrongs.android.pop
+com.estrongs.android.pop.pro
+com.fastaccess.github
+com.firstrowria.pushnotificationtester
+com.fvd.eversync
+com.gianlu.aria2app
+com.github.yeriomin.yalpstore
+com.google.android.apps.docs.editors.sheets
 com.google.android.instantapps.supervisor
-com.google.android.keep
-com.google.android.music
 com.google.android.ogyoutube
 com.google.android.partnersetup
-com.google.android.play.games
-com.google.android.street
 com.google.android.syncadapters.calendar
 com.google.android.syncadapters.contacts
-com.google.android.talk
 com.google.android.tts
-com.google.android.videos
-com.google.android.youtube
-com.google.ar.lens
 com.hochan.coldsoup
 com.ifttt.ifttt
 com.imgur.mobile
 com.innologica.inoreader
-com.instagram.android
 com.instapaper.android
 com.jarvanh.vpntether
-com.kapp.youtube.final
-com.klinker.android.twitter_l
-com.lastpass.lpandroid
-com.linecorp.linelite
-com.lingodeer
 com.mediapods.tumbpods
 com.mgoogle.android.gms
-com.microsoft.emmx
 com.microsoft.office.powerpoint
-com.microsoft.skydrive
 com.mixplorer
 com.msd.consumerchinese
 com.msd.professionalchinese
 com.mss2011c.sharehelper
-com.netflix.mediaclient
 com.newin.nplayer.pro
-com.nianticlabs.ingress.prime.qa
-com.nianticproject.ingress
-com.ninefolders.hd3
-com.ninegag.android.app
-com.nintendo.zara
-com.nytimes.cn
 com.oasisfeng.island
-com.ocnt.liveapp.hw
 com.orekie.search
-com.patreon.android
-com.paypal.android.p2pmobile
-com.perol.asdpl.pixivez
-com.pinterest
-com.popularapp.periodcalendar
 com.popularapp.videodownloaderforinstagram
 com.pushbullet.android
-com.quoord.tapatalkpro.activity
-com.quora.android
-com.rayark.cytus2
-com.rayark.implosion
-com.rayark.pluto
-com.reddit.frontpage
-com.resilio.sync
 com.rhmsoft.edit
-com.rubenmayayo.reddit
-com.sec.android.app.sbrowser
-com.sec.android.app.sbrowser.beta
-com.shanga.walli
-com.simplehabit.simplehabitapp
 com.slack
-com.snaptube.premium
-com.sololearn
-com.sonelli.juicessh
-com.spotify.music
 com.tencent.huatuo
 com.termux
-com.teslacoilsw.launcher
-com.theinitium.news
-com.thomsonreuters.reuters
 com.thunkable.android.hritvik00.freenom
 com.topjohnwu.magisk
-com.tripadvisor.tripadvisor
-com.tumblr
-com.twitter.android
 com.u91porn
 com.u9porn
-com.ubisoft.dance.justdance2015companion
-com.utopia.pxview
-com.valvesoftware.android.steam.communimunity
-com.valvesoftware.android.steam.community
-com.vanced.android.youtube
 com.vimeo.android.videoapp
-com.vivaldi.browser
-com.vivaldi.browser.snapshot
-com.vkontakte.android
-com.whatsapp
-com.wire
 com.wuxiangai.refactor
-com.xda.labs
-com.xvideos.app
 com.yandex.browser
-com.yandex.browser.beta
-com.yandex.browser.alpha
 com.z28j.feel
-con.medium.reader
-de.apkgrabber
 de.robv.android.xposed.installer
 dk.tacit.android.foldersync.full
 es.rafalense.telegram.themes
 es.rafalense.themes
 flipboard.app
-fm.moon.app
-fr.gouv.etalab.mastodon
 github.tornaco.xposedmoduletest
-idm.internet.download.manager
-idm.internet.download.manager.plus
-io.github.javiewer
-io.github.skyhacker2.magnetsearch
 io.va.exposed
-it.mvilla.android.fenix2
-jp.bokete.app.android
-jp.naver.line.android
 jp.pxv.android
-luo.speedometergpspro
-mark.via.gp
 me.tshine.easymark
 net.teeha.android.url_shortener
-net.tsapps.appsales
 onion.fire
 org.fdroid.fdroid
-org.freedownloadmanager.fdm
-org.kustom.widget
 org.mozilla.fennec_aurora
-org.mozilla.fenix
-org.mozilla.fenix.nightly
-org.mozilla.firefox
-org.mozilla.firefox_beta
-org.mozilla.focus
 org.schabi.newpipe
 org.telegram.messenger
-org.telegram.multi
-org.telegram.plus
-org.thunderdog.challegram
 org.torproject.android
-org.torproject.torbrowser_alpha
-org.wikipedia
 org.xbmc.kodi
 pl.zdunex25.updater
-tv.twitch.android.app
-tw.com.gamer.android.activecenter
 videodownloader.downloadvideo.downloader
-uk.co.bbc.learningenglish
-com.ted.android
+com.quora.android
+com.lingodeer
+org.wikipedia
+com.ninegag.android.app
+com.duolingo
+com.patreon.android
+com.valvesoftware.android.steam.communimunity
+co.wanqu.android
+jp.bokete.app.android
+com.vkontakte.android
+com.amazon.mshop.android.shopping
+com.ubisoft.dance.justdance2015companion
+com.gameloft.android.anmp.glofta8hm
+com.gameloft.android.anmp.glofta9hm
+com.binance.dev
+com.asahi.tida.tablet
+com.theinitium.news
+com.driverbrowser
+com.thomsonreuters.reuters
+com.nytimes.cn
+com.android.providers.downloads.ui
+com.avmovie
+bbc.mobile.news.ww
+org.mozilla.focus
+io.github.javiewer
+com.sonelli.juicessh
+con.medium.reader
+com.microsoft.skydrive
+com.valvesoftware.android.steam.community
+com.nintendo.zara
+org.torproject.torbrowser_alpha
+tv.twitch.android.app
+com.shanga.walli
+com.whatsapp
+com.wire
+com.simplehabit.simplehabitapp
@@ -13,8 +13,8 @@
        }
      },
      "system": {
-        "statsOutboundUplink": true,
-        "statsOutboundDownlink": true
+        "statsInboundUplink": true,
+        "statsInboundDownlink": true
      }
  },
  "inbounds": [{
@@ -54,7 +54,7 @@
          "users": [
            {
              "id": "a3482e88-686a-4a58-8126-99c9df64b7bf",
-              "alterId": 0,
+              "alterId": 64,
              "security": "auto",
              "level": 8
            }
@@ -81,9 +81,7 @@
  },
  {
    "protocol": "freedom",
-    "settings": {
-      "domainStrategy": "UseIP"
-    },
+    "settings": {},
    "tag": "direct"
  },
  {
@@ -1,53 +0,0 @@
-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.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.util.Utils
-
-class AngApplication : MultiDexApplication() {
-    companion object {
-        //const val PREF_LAST_VERSION = "pref_last_version"
-        lateinit var application: AngApplication
-    }
-
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        application = this
-    }
-
-    private val workManagerConfiguration: Configuration = Configuration.Builder()
-        .setDefaultProcessName("${ANG_PACKAGE}:bg")
-        .build()
-
-    override fun onCreate() {
-        super.onCreate()
-
-//        LeakCanary.install(this)
-
-//        val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-//        firstRun = defaultSharedPreferences.getInt(PREF_LAST_VERSION, 0) != BuildConfig.VERSION_CODE
-//        if (firstRun)
-//            defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
-
-        MMKV.initialize(this)
-
-        Utils.setNightMode()
-        // Initialize WorkManager with the custom configuration
-        WorkManager.initialize(this, workManagerConfiguration)
-
-        SettingsManager.initRoutingRulesets(this)
-    }
-
-    fun getPackageInfo(packageName: String) = packageManager.getPackageInfo(
-        packageName, if (Build.VERSION.SDK_INT >= 28) PackageManager.GET_SIGNING_CERTIFICATES
-        else @Suppress("DEPRECATION") PackageManager.GET_SIGNATURES
-    )!!
-
-}
@@ -1,188 +0,0 @@
-package com.v2ray.ang
-
-
-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 configuration keys. */
-    const val ANG_CONFIG = "ang_config"
-    const val PREF_INAPP_BUY_IS_PREMIUM = "pref_inapp_buy_is_premium"
-
-    /** 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"
-    const val PREF_LOCAL_DNS_ENABLED = "pref_local_dns_enabled"
-    const val PREF_FAKE_DNS_ENABLED = "pref_fake_dns_enabled"
-    const val PREF_APPEND_HTTP_PROXY = "pref_append_http_proxy"
-    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_RULESET = "pref_routing_ruleset"
-    const val PREF_MUX_ENABLED = "pref_mux_enabled"
-    const val PREF_MUX_CONCURRENCY = "pref_mux_concurrency"
-    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" // 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"
-    const val PREF_SOCKS_PORT = "pref_socks_port"
-    const val PREF_HTTP_PORT = "pref_http_port"
-    const val PREF_REMOTE_DNS = "pref_remote_dns"
-    const val PREF_DOMESTIC_DNS = "pref_domestic_dns"
-    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"
-
-    /** Protocol identifiers. */
-    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 =
-        "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
-    const val v2rayNGUrl = "https://github.com/2dust/v2rayNG"
-    const val v2rayNGIssues = "$v2rayNGUrl/issues"
-    const val v2rayNGWikiMode = "$v2rayNGUrl/wiki/Mode"
-    const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md"
-    const val PromotionUrl = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
-    const val GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/"
-    const val TgChannelUrl = "https://t.me/github_2dust"
-    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
-    const val MSG_UNREGISTER_CLIENT = 2
-    const val MSG_STATE_START = 3
-    const val MSG_STATE_START_SUCCESS = 31
-    const val MSG_STATE_START_FAILURE = 32
-    const val MSG_STATE_STOP = 4
-    const val MSG_STATE_STOP_SUCCESS = 41
-    const val MSG_STATE_RESTART = 5
-    const val MSG_MEASURE_DELAY = 6
-    const val MSG_MEASURE_DELAY_SUCCESS = 61
-    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"
-
-    // Google API rule constants
-    const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
-    const val GOOGLEAPIS_COM_DOMAIN = "googleapis.com"
-
-    // Android Private DNS constants
-    const val DNS_DNSPOD_DOMAIN = "dot.pub"
-    const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
-    const val DNS_GOOGLE_DOMAIN = "dns.google"
-    const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
-    const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
-
-    
-    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
-    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
-    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
-    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
-
-    const val DEFAULT_PORT = 443
-    const val DEFAULT_SECURITY = "auto"
-    const val DEFAULT_LEVEL = 8
-    const val DEFAULT_NETWORK = "tcp"
-    const val TLS = "tls"
-    const val REALITY = "reality"
-    const val HEADER_TYPE_HTTP = "http"
-
-}
@@ -1,11 +0,0 @@
-package com.v2ray.ang.dto
-
-import android.graphics.drawable.Drawable
-
-data class AppInfo(
-    val appName: String,
-    val packageName: String,
-    val appIcon: Drawable,
-    val isSystemApp: Boolean,
-    var isSelected: Int
-)
@@ -1,8 +0,0 @@
-package com.v2ray.ang.dto
-
-data class AssetUrlItem(
-    var remarks: String = "",
-    var url: String = "",
-    val addedTime: Long = System.currentTimeMillis(),
-    var lastUpdated: Long = -1
-)
@@ -1,9 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ConfigResult(
-    var status: Boolean,
-    var guid: String? = null,
-    var content: String = "",
-    var domainPort: String? = null,
-)
-
@@ -1,21 +0,0 @@
-package com.v2ray.ang.dto
-
-import com.v2ray.ang.AppConfig
-
-
-enum class EConfigType(val value: Int, val protocolScheme: String) {
-    VMESS(1, AppConfig.VMESS),
-    CUSTOM(2, AppConfig.CUSTOM),
-    SHADOWSOCKS(3, AppConfig.SHADOWSOCKS),
-    SOCKS(4, AppConfig.SOCKS),
-    VLESS(5, AppConfig.VLESS),
-    TROJAN(6, AppConfig.TROJAN),
-    WIREGUARD(7, AppConfig.WIREGUARD),
-//    TUIC(8, AppConfig.TUIC),
-    HYSTERIA2(9, AppConfig.HYSTERIA2),
-    HTTP(10, AppConfig.HTTP);
-
-    companion object {
-        fun fromInt(value: Int) = entries.firstOrNull { it.value == value }
-    }
-}
@@ -1,40 +0,0 @@
-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,
-    val transport: TransportBean? = 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?,
-        val pinSHA256: String?,
-    )
-
-    data class TransportBean(
-        val type: String?,
-        val udp: TransportUdpBean?
-    ) {
-        data class TransportUdpBean(
-            val hopInterval: String?,
-        )
-    }
-}
@@ -1,19 +0,0 @@
-package com.v2ray.ang.dto
-
-enum class Language(val code: String) {
-    AUTO("auto"),
-    ENGLISH("en"),
-    CHINA("zh-rCN"),
-    TRADITIONAL_CHINESE("zh-rTW"),
-    VIETNAMESE("vi"),
-    RUSSIAN("ru"),
-    PERSIAN("fa"),
-    BANGLA("bn"),
-    BAKHTIARI("bqi-rIR");
-
-    companion object {
-        fun fromCode(code: String): Language {
-            return entries.find { it.code == code } ?: AUTO
-        }
-    }
-}
@@ -1,18 +0,0 @@
-package com.v2ray.ang.dto
-
-enum class NetworkType(val type: String) {
-    TCP("tcp"),
-    KCP("kcp"),
-    WS("ws"),
-    HTTP_UPGRADE("httpupgrade"),
-    SPLIT_HTTP("splithttp"),
-    XHTTP("xhttp"),
-    HTTP("http"),
-    H2("h2"),
-    //QUIC("quic"),
-    GRPC("grpc");
-
-    companion object {
-        fun fromString(type: String?) = entries.find { it.type == type } ?: TCP
-    }
-}
@@ -1,113 +0,0 @@
-package com.v2ray.ang.dto
-
-import com.v2ray.ang.AppConfig.TAG_BLOCKED
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.AppConfig.TAG_PROXY
-import com.v2ray.ang.util.Utils
-
-data class ProfileItem(
-    val configVersion: Int = 4,
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    var addedTime: Long = System.currentTimeMillis(),
-
-    var remarks: String = "",
-    var server: String? = null,
-    var serverPort: String? = null,
-
-    var password: String? = null,
-    var method: String? = null,
-    var flow: String? = null,
-    var username: String? = null,
-
-    var network: String? = null,
-    var headerType: String? = null,
-    var host: String? = null,
-    var path: String? = null,
-    var seed: String? = null,
-    var quicSecurity: String? = null,
-    var quicKey: String? = null,
-    var mode: String? = null,
-    var serviceName: String? = null,
-    var authority: String? = null,
-    var xhttpMode: String? = null,
-    var xhttpExtra: String? = null,
-
-    var security: String? = null,
-    var sni: String? = null,
-    var alpn: String? = null,
-    var fingerPrint: String? = null,
-    var insecure: Boolean? = null,
-
-    var publicKey: String? = null,
-    var shortId: String? = null,
-    var spiderX: String? = null,
-
-    var secretKey: String? = null,
-    var preSharedKey: String? = null,
-    var localAddress: String? = null,
-    var reserved: String? = null,
-    var mtu: Int? = null,
-
-    var obfsPassword: String? = null,
-    var portHopping: String? = null,
-    var portHoppingInterval: String? = null,
-    var pinSHA256: String? = null,
-
-    ) {
-    companion object {
-        fun create(configType: EConfigType): ProfileItem {
-            return ProfileItem(configType = configType)
-        }
-    }
-
-    fun getAllOutboundTags(): MutableList<String> {
-        return mutableListOf(TAG_PROXY, TAG_DIRECT, TAG_BLOCKED)
-    }
-
-    fun getServerAddressAndPort(): String {
-        return Utils.getIpv6Address(server) + ":" + serverPort
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other == null) return false
-        val obj = other as ProfileItem
-
-        return (this.server == obj.server
-                && this.serverPort == obj.serverPort
-                && this.password == obj.password
-                && this.method == obj.method
-                && this.flow == obj.flow
-                && this.username == obj.username
-
-                && this.network == obj.network
-                && this.headerType == obj.headerType
-                && this.host == obj.host
-                && this.path == obj.path
-                && this.seed == obj.seed
-                && this.quicSecurity == obj.quicSecurity
-                && this.quicKey == obj.quicKey
-                && this.mode == obj.mode
-                && this.serviceName == obj.serviceName
-                && this.authority == obj.authority
-                && this.xhttpMode == obj.xhttpMode
-
-                && this.security == obj.security
-                && this.sni == obj.sni
-                && this.alpn == obj.alpn
-                && this.fingerPrint == obj.fingerPrint
-                && this.publicKey == obj.publicKey
-                && this.shortId == obj.shortId
-
-                && this.secretKey == obj.secretKey
-                && this.localAddress == obj.localAddress
-                && this.reserved == obj.reserved
-                && this.mtu == obj.mtu
-
-                && this.obfsPassword == obj.obfsPassword
-                && this.portHopping == obj.portHopping
-                && this.portHoppingInterval == obj.portHoppingInterval
-                && this.pinSHA256 == obj.pinSHA256
-                )
-    }
-}
@@ -1,9 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ProfileLiteItem(
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    var remarks: String = "",
-    var server: String?,
-    var serverPort: Int?,
-)
@@ -1,20 +0,0 @@
-package com.v2ray.ang.dto
-
-enum class RoutingType(val fileName: String) {
-    WHITE("custom_routing_white"),
-    BLACK("custom_routing_black"),
-    GLOBAL("custom_routing_global"),
-    WHITE_IRAN("custom_routing_white_iran");
-
-    companion object {
-        fun fromIndex(index: Int): RoutingType {
-            return when (index) {
-                0 -> WHITE
-                1 -> BLACK
-                2 -> GLOBAL
-                3 -> WHITE_IRAN
-                else -> WHITE
-            }
-        }
-    }
-}
@@ -1,13 +0,0 @@
-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,
-)
@@ -1,10 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ServerAffiliationInfo(var testDelayMillis: Long = 0L) {
-    fun getTestDelayString(): String {
-        if (testDelayMillis == 0L) {
-            return ""
-        }
-        return testDelayMillis.toString() + "ms"
-    }
-}
@@ -1,86 +0,0 @@
-package com.v2ray.ang.dto
-
-import com.v2ray.ang.AppConfig.TAG_BLOCKED
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.AppConfig.TAG_PROXY
-
-data class ServerConfig(
-    val configVersion: Int = 3,
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    val addedTime: Long = System.currentTimeMillis(),
-    var remarks: String = "",
-    val outboundBean: V2rayConfig.OutboundBean? = null,
-    var fullConfig: V2rayConfig? = null
-) {
-    companion object {
-        fun create(configType: EConfigType): ServerConfig {
-            when (configType) {
-                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(
-                                        users = listOf(V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean())
-                                    )
-                                )
-                            ),
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
-                        )
-                    )
-
-                EConfigType.CUSTOM ->
-                    return ServerConfig(configType = configType)
-
-                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())
-                            ),
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
-                        )
-                    )
-
-                EConfigType.WIREGUARD ->
-                    return ServerConfig(
-                        configType = configType,
-                        outboundBean = V2rayConfig.OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                secretKey = "",
-                                peers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean())
-                            )
-                        )
-                    )
-            }
-        }
-    }
-
-    fun getProxyOutbound(): V2rayConfig.OutboundBean? {
-        if (configType != EConfigType.CUSTOM) {
-            return outboundBean
-        }
-        return fullConfig?.getProxyOutbound()
-    }
-
-    fun getAllOutboundTags(): MutableList<String> {
-        if (configType != EConfigType.CUSTOM) {
-            return mutableListOf(TAG_PROXY, TAG_DIRECT, TAG_BLOCKED)
-        }
-        fullConfig?.let { config ->
-            return config.outbounds.map { it.tag }.toMutableList()
-        }
-        return mutableListOf()
-    }
-}
@@ -1,6 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ServersCache(
-    val guid: String,
-    val profile: ProfileItem
-)
@@ -1,15 +0,0 @@
-package com.v2ray.ang.dto
-
-data class SubscriptionItem(
-    var remarks: String = "",
-    var url: String = "",
-    var enabled: Boolean = true,
-    val addedTime: Long = System.currentTimeMillis(),
-    var lastUpdated: Long = -1,
-    var autoUpdate: Boolean = false,
-    val updateInterval: Int? = null,
-    var prevProfile: String? = null,
-    var nextProfile: String? = null,
-    var filter: String? = null,
-)
-
@@ -1,727 +0,0 @@
-package com.v2ray.ang.dto
-
-import android.text.TextUtils
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonPrimitive
-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.AppConfig
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.*
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.*
-import com.v2ray.ang.util.Utils
-import java.lang.reflect.Type
-
-data class V2rayConfig(
-    var remarks: String? = null,
-    var stats: Any? = null,
-    val log: LogBean,
-    var policy: PolicyBean?,
-    val inbounds: ArrayList<InboundBean>,
-    var outbounds: ArrayList<OutboundBean>,
-    var dns: DnsBean,
-    val routing: RoutingBean,
-    val api: Any? = null,
-    val transport: Any? = null,
-    val reverse: Any? = null,
-    var fakedns: Any? = null,
-    val browserForwarder: Any? = null,
-    var observatory: Any? = null,
-    var burstObservatory: Any? = null
-) {
-
-    data class LogBean(
-        val access: String,
-        val error: String,
-        var loglevel: String?,
-        val dnsLog: Boolean? = null
-    )
-
-    data class InboundBean(
-        var tag: String,
-        var port: Int,
-        var protocol: String,
-        var listen: String? = null,
-        val settings: Any? = null,
-        val sniffing: SniffingBean?,
-        val streamSettings: Any? = null,
-        val allocate: Any? = null
-    ) {
-
-        data class InSettingsBean(
-            val auth: String? = null,
-            val udp: Boolean? = null,
-            val userLevel: Int? = null,
-            val address: String? = null,
-            val port: Int? = null,
-            val network: String? = null
-        )
-
-        data class SniffingBean(
-            var enabled: Boolean,
-            val destOverride: ArrayList<String>,
-            val metadataOnly: Boolean? = null,
-            var routeOnly: Boolean? = null
-        )
-    }
-
-    data class OutboundBean(
-        var tag: String = "proxy",
-        var protocol: String,
-        var settings: OutSettingsBean? = null,
-        var streamSettings: StreamSettingsBean? = null,
-        val proxySettings: Any? = null,
-        val sendThrough: String? = null,
-        var mux: MuxBean? = MuxBean(false)
-    ) {
-        companion object {
-            fun create(configType: EConfigType): OutboundBean? {
-                return when (configType) {
-                    EConfigType.VMESS,
-                    EConfigType.VLESS ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                vnext = listOf(
-                                    VnextBean(
-                                        users = listOf(UsersBean())
-                                    )
-                                )
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.SHADOWSOCKS,
-                    EConfigType.SOCKS,
-                    EConfigType.HTTP,
-                    EConfigType.TROJAN,
-                    EConfigType.HYSTERIA2 ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                servers = listOf(ServersBean())
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.WIREGUARD ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                secretKey = "",
-                                peers = listOf(WireGuardBean())
-                            )
-                        )
-
-                    EConfigType.CUSTOM -> null
-                }
-            }
-        }
-
-        data class OutSettingsBean(
-            var vnext: List<VnextBean>? = null,
-            var fragment: FragmentBean? = null,
-            var noises: List<NoiseBean>? = null,
-            var servers: List<ServersBean>? = null,
-            /*Blackhole*/
-            var response: Response? = null,
-            /*DNS*/
-            val network: String? = null,
-            var address: Any? = null,
-            val port: Int? = null,
-            /*Freedom*/
-            var domainStrategy: String? = null,
-            val redirect: String? = null,
-            val userLevel: Int? = null,
-            /*Loopback*/
-            val inboundTag: String? = null,
-            /*Wireguard*/
-            var secretKey: String? = 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 = "",
-                var port: Int = AppConfig.DEFAULT_PORT,
-                var users: List<UsersBean>
-            ) {
-
-                data class UsersBean(
-                    var id: String = "",
-                    var alterId: Int? = null,
-                    var security: String? = null,
-                    var level: Int = AppConfig.DEFAULT_LEVEL,
-                    var encryption: String? = null,
-                    var flow: String? = null
-                )
-            }
-
-            data class FragmentBean(
-                var packets: String? = null,
-                var length: String? = null,
-                var interval: String? = null
-            )
-
-            data class NoiseBean(
-                var type: String? = null,
-                var packet: String? = null,
-                var delay: String? = null
-            )
-
-            data class ServersBean(
-                var address: String = "",
-                var method: String? = null,
-                var ota: Boolean = false,
-                var password: String? = null,
-                var port: Int = AppConfig.DEFAULT_PORT,
-                var level: Int = AppConfig.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 = AppConfig.DEFAULT_LEVEL
-                )
-            }
-
-            data class Response(var type: String)
-
-            data class WireGuardBean(
-                var publicKey: String = "",
-                var preSharedKey: String = "",
-                var endpoint: String = ""
-            )
-        }
-
-        data class StreamSettingsBean(
-            var network: String = AppConfig.DEFAULT_NETWORK,
-            var security: String? = null,
-            var tcpSettings: TcpSettingsBean? = null,
-            var kcpSettings: KcpSettingsBean? = null,
-            var wsSettings: WsSettingsBean? = null,
-            var httpupgradeSettings: HttpupgradeSettingsBean? = null,
-            var xhttpSettings: XhttpSettingsBean? = null,
-            var httpSettings: HttpSettingsBean? = null,
-            var tlsSettings: TlsSettingsBean? = null,
-            var quicSettings: QuicSettingBean? = null,
-            var realitySettings: TlsSettingsBean? = null,
-            var grpcSettings: GrpcSettingsBean? = null,
-            var hy2steriaSettings: Hy2steriaSettingsBean? = null,
-            val dsSettings: Any? = null,
-            var sockopt: SockoptBean? = null
-        ) {
-
-            data class TcpSettingsBean(
-                var header: HeaderBean = HeaderBean(),
-                val acceptProxyProtocol: Boolean? = null
-            ) {
-                data class HeaderBean(
-                    var type: String = "none",
-                    var request: RequestBean? = null,
-                    var response: Any? = null
-                ) {
-                    data class RequestBean(
-                        var path: List<String> = ArrayList(),
-                        var headers: HeadersBean = HeadersBean(),
-                        val version: String? = null,
-                        val method: 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,
-                var tti: Int = 50,
-                var uplinkCapacity: Int = 12,
-                var downlinkCapacity: Int = 100,
-                var congestion: Boolean = false,
-                var readBufferSize: Int = 1,
-                var writeBufferSize: Int = 1,
-                var header: HeaderBean = HeaderBean(),
-                var seed: String? = null
-            ) {
-                data class HeaderBean(var type: String = "none")
-            }
-
-            data class WsSettingsBean(
-                var path: String? = null,
-                var headers: HeadersBean = HeadersBean(),
-                val maxEarlyData: Int? = null,
-                val useBrowserForwarding: Boolean? = null,
-                val acceptProxyProtocol: Boolean? = null
-            ) {
-                data class HeadersBean(var Host: String = "")
-            }
-
-            data class HttpupgradeSettingsBean(
-                var path: String? = null,
-                var host: String? = null,
-                val acceptProxyProtocol: Boolean? = null
-            )
-
-            data class XhttpSettingsBean(
-                var path: String? = null,
-                var host: String? = null,
-                var mode: String? = null,
-                var extra: Any? = null,
-            )
-
-            data class HttpSettingsBean(
-                var host: List<String> = ArrayList(),
-                var path: String? = null
-            )
-
-            data class SockoptBean(
-                var TcpNoDelay: Boolean? = null,
-                var tcpKeepAliveIdle: Int? = null,
-                var tcpFastOpen: Boolean? = null,
-                var tproxy: String? = null,
-                var mark: Int? = null,
-                var dialerProxy: String? = null
-            )
-
-            data class TlsSettingsBean(
-                var allowInsecure: Boolean = false,
-                var serverName: String? = null,
-                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 = "",
-                var authority: String? = null,
-                var multiMode: Boolean? = null,
-                var idle_timeout: Int? = null,
-                var health_check_timeout: Int? = null
-            )
-
-            data class Hy2steriaSettingsBean(
-                var password: String? = null,
-                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: String? = null
-                network = if (transport.isEmpty()) NetworkType.TCP.type else transport
-                when (network) {
-                    NetworkType.TCP.type -> {
-                        val tcpSetting = TcpSettingsBean()
-                        if (headerType == AppConfig.HEADER_TYPE_HTTP) {
-                            tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP
-                            if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
-                                val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
-                                requestObj.headers.Host = host.orEmpty().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)
-                            }
-                        } else {
-                            tcpSetting.header.type = "none"
-                            sni = host
-                        }
-                        tcpSettings = tcpSetting
-                    }
-
-                    NetworkType.KCP.type -> {
-                        val kcpsetting = KcpSettingsBean()
-                        kcpsetting.header.type = headerType ?: "none"
-                        if (seed.isNullOrEmpty()) {
-                            kcpsetting.seed = null
-                        } else {
-                            kcpsetting.seed = seed
-                        }
-                        kcpSettings = kcpsetting
-                    }
-
-                    NetworkType.WS.type -> {
-                        val wssetting = WsSettingsBean()
-                        wssetting.headers.Host = host.orEmpty()
-                        sni = host
-                        wssetting.path = path ?: "/"
-                        wsSettings = wssetting
-                    }
-
-                    NetworkType.HTTP_UPGRADE.type -> {
-                        val httpupgradeSetting = HttpupgradeSettingsBean()
-                        httpupgradeSetting.host = host.orEmpty()
-                        sni = host
-                        httpupgradeSetting.path = path ?: "/"
-                        httpupgradeSettings = httpupgradeSetting
-                    }
-
-                    NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
-                        val xhttpSetting = XhttpSettingsBean()
-                        xhttpSetting.host = host.orEmpty()
-                        sni = host
-                        xhttpSetting.path = path ?: "/"
-                        xhttpSettings = xhttpSetting
-                    }
-
-                    NetworkType.H2.type, NetworkType.HTTP.type -> {
-                        network = NetworkType.H2.type
-                        val h2Setting = HttpSettingsBean()
-                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                        sni = h2Setting.host.getOrNull(0)
-                        h2Setting.path = path ?: "/"
-                        httpSettings = h2Setting
-                    }
-
-//                    "quic" -> {
-//                        val quicsetting = QuicSettingBean()
-//                        quicsetting.security = quicSecurity ?: "none"
-//                        quicsetting.key = key.orEmpty()
-//                        quicsetting.header.type = headerType ?: "none"
-//                        quicSettings = quicsetting
-//                    }
-
-                    NetworkType.GRPC.type -> {
-                        val grpcSetting = GrpcSettingsBean()
-                        grpcSetting.multiMode = mode == "multi"
-                        grpcSetting.serviceName = serviceName.orEmpty()
-                        grpcSetting.authority = authority.orEmpty()
-                        grpcSetting.idle_timeout = 60
-                        grpcSetting.health_check_timeout = 20
-                        sni = authority
-                        grpcSettings = grpcSetting
-                    }
-                }
-                return sni
-            }
-
-            fun populateTlsSettings(
-                streamSecurity: String,
-                allowInsecure: Boolean,
-                sni: String?,
-                fingerprint: String?,
-                alpns: String?,
-                publicKey: String?,
-                shortId: String?,
-                spiderX: String?
-            ) {
-                security = if (streamSecurity.isEmpty()) null else streamSecurity
-                if (security == null) return
-                val tlsSetting = TlsSettingsBean(
-                    allowInsecure = allowInsecure,
-                    serverName = if (sni.isNullOrEmpty()) null else sni,
-                    fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
-                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
-                    publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
-                    shortId = if (shortId.isNullOrEmpty()) null else shortId,
-                    spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
-                )
-                if (security == AppConfig.TLS) {
-                    tlsSettings = tlsSetting
-                    realitySettings = null
-                } else if (security == AppConfig.REALITY) {
-                    tlsSettings = null
-                    realitySettings = tlsSetting
-                }
-            }
-        }
-
-        data class MuxBean(
-            var enabled: Boolean,
-            var concurrency: Int = 8,
-            var xudpConcurrency: Int = 8,
-            var xudpProxyUDP443: String = "",
-        )
-
-        fun getServerAddress(): String? {
-            if (protocol.equals(EConfigType.VMESS.name, true)
-                || protocol.equals(EConfigType.VLESS.name, true)
-            ) {
-                return settings?.vnext?.first()?.address
-            } else 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.HYSTERIA2.name, true)
-            ) {
-                return settings?.servers?.first()?.address
-            } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.first()?.endpoint?.substringBeforeLast(":")
-            }
-            return null
-        }
-
-        fun getServerPort(): Int? {
-            if (protocol.equals(EConfigType.VMESS.name, true)
-                || protocol.equals(EConfigType.VLESS.name, true)
-            ) {
-                return settings?.vnext?.first()?.port
-            } else 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.HYSTERIA2.name, true)
-            ) {
-                return settings?.servers?.first()?.port
-            } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.first()?.endpoint?.substringAfterLast(":")?.toInt()
-            }
-            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)
-            ) {
-                return settings?.vnext?.first()?.users?.first()?.id
-            } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-                || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.HYSTERIA2.name, true)
-            ) {
-                return settings?.servers?.first()?.password
-            } else if (protocol.equals(EConfigType.SOCKS.name, true)
-                || protocol.equals(EConfigType.HTTP.name, true)
-            ) {
-                return settings?.servers?.first()?.users?.first()?.pass
-            } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.secretKey
-            }
-            return null
-        }
-
-        fun getSecurityEncryption(): String? {
-            return when {
-                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.first()?.users?.first()?.security
-                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.first()?.users?.first()?.encryption
-                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.first()?.method
-                else -> null
-            }
-        }
-
-        fun getTransportSettingDetails(): List<String?>? {
-            if (protocol.equals(EConfigType.VMESS.name, true)
-                || protocol.equals(EConfigType.VLESS.name, true)
-                || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-            ) {
-                val transport = streamSettings?.network ?: return null
-                return when (transport) {
-                    NetworkType.TCP.type -> {
-                        val tcpSetting = streamSettings?.tcpSettings ?: return null
-                        listOf(
-                            tcpSetting.header.type,
-                            tcpSetting.header.request?.headers?.Host?.joinToString(",").orEmpty(),
-                            tcpSetting.header.request?.path?.joinToString(",").orEmpty()
-                        )
-                    }
-
-                    NetworkType.KCP.type -> {
-                        val kcpSetting = streamSettings?.kcpSettings ?: return null
-                        listOf(
-                            kcpSetting.header.type,
-                            "",
-                            kcpSetting.seed.orEmpty()
-                        )
-                    }
-
-                    NetworkType.WS.type -> {
-                        val wsSetting = streamSettings?.wsSettings ?: return null
-                        listOf(
-                            "",
-                            wsSetting.headers.Host,
-                            wsSetting.path
-                        )
-                    }
-
-                    NetworkType.HTTP_UPGRADE.type -> {
-                        val httpupgradeSetting = streamSettings?.httpupgradeSettings ?: return null
-                        listOf(
-                            "",
-                            httpupgradeSetting.host,
-                            httpupgradeSetting.path
-                        )
-                    }
-
-                    NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
-                        val xhttpSettings = streamSettings?.xhttpSettings ?: return null
-                        listOf(
-                            "",
-                            xhttpSettings.host,
-                            xhttpSettings.path
-                        )
-                    }
-
-                    NetworkType.H2.type -> {
-                        val h2Setting = streamSettings?.httpSettings ?: return null
-                        listOf(
-                            "",
-                            h2Setting.host.joinToString(","),
-                            h2Setting.path
-                        )
-                    }
-
-//                    "quic" -> {
-//                        val quicSetting = streamSettings?.quicSettings ?: return null
-//                        listOf(
-//                            quicSetting.header.type,
-//                            quicSetting.security,
-//                            quicSetting.key
-//                        )
-//                    }
-
-                    NetworkType.GRPC.type -> {
-                        val grpcSetting = streamSettings?.grpcSettings ?: return null
-                        listOf(
-                            if (grpcSetting.multiMode == true) "multi" else "gun",
-                            grpcSetting.authority.orEmpty(),
-                            grpcSetting.serviceName
-                        )
-                    }
-
-                    else -> null
-                }
-            }
-            return null
-        }
-    }
-
-    data class DnsBean(
-        var servers: ArrayList<Any>? = null,
-        var hosts: Map<String, Any>? = null,
-        val clientIp: String? = null,
-        val disableCache: Boolean? = null,
-        val queryStrategy: String? = null,
-        val tag: String? = null
-    ) {
-        data class ServersBean(
-            var address: String = "",
-            var port: Int? = null,
-            var domains: List<String>? = null,
-            var expectIPs: List<String>? = null,
-            val clientIp: String? = null,
-            val skipFallback: Boolean? = null,
-        )
-    }
-
-    data class RoutingBean(
-        var domainStrategy: String,
-        var domainMatcher: String? = null,
-        var rules: ArrayList<RulesBean>,
-        val balancers: List<Any>? = null
-    ) {
-
-        data class RulesBean(
-            var type: String = "field",
-            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>,
-        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 ->
-            EConfigType.entries.forEach {
-                if (outbound.protocol.equals(it.name, true)) {
-                    return outbound
-                }
-            }
-        }
-        return null
-    }
-
-    fun toPrettyPrinting(): String {
-        return 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()
-            .toJson(this)
-    }
-}
@@ -1,19 +0,0 @@
-package com.v2ray.ang.dto
-
-data class VmessQRCode(
-    var v: String = "",
-    var ps: String = "",
-    var add: String = "",
-    var port: String = "",
-    var id: String = "",
-    var aid: String = "0",
-    var scy: String = "",
-    var net: String = "",
-    var type: String = "",
-    var host: String = "",
-    var path: String = "",
-    var tls: String = "",
-    var sni: String = "",
-    var alpn: String = "",
-    var fp: String = ""
-)
@@ -1,98 +0,0 @@
-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?
-    get() = applicationContext as? AngApplication
-
-fun Context.toast(message: Int) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
-}
-
-fun Context.toast(message: CharSequence) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
-}
-
-fun JSONObject.putOpt(pair: Pair<String, Any?>) {
-    put(pair.first, pair.second)
-}
-
-fun JSONObject.putOpt(pairs: Map<String, Any?>) {
-    pairs.forEach { put(it.key, it.value) }
-}
-
-const val THRESHOLD = 1000L
-const val DIVISOR = 1024.0
-
-fun Long.toSpeedString(): String = this.toTrafficString() + "/s"
-
-fun Long.toTrafficString(): String {
-    val units = arrayOf("B", "KB", "MB", "GB", "TB", "PB")
-    var size = this.toDouble()
-    var unitIndex = 0
-    while (size >= THRESHOLD && unitIndex < units.size - 1) {
-        size /= DIVISOR
-        unitIndex++
-    }
-    return String.format("%.1f %s", size, units[unitIndex])
-}
-
-val URLConnection.responseLength: Long
-    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        contentLengthLong
-    } else {
-        contentLength.toLong()
-    }
-
-val URI.idnHost: String
-    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
-}
-
-inline fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty())
@@ -1,21 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.util.JsonUtil
-
-object CustomFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.CUSTOM)
-
-        val fullConfig = JsonUtil.fromJson(str, V2rayConfig::class.java)
-        val outbound = fullConfig.getProxyOutbound()
-
-        config.remarks = fullConfig?.remarks ?: System.currentTimeMillis().toString()
-        config.server = outbound?.getServerAddress()
-        config.serverPort = outbound?.getServerPort().toString()
-
-        return config
-    }
-}
@@ -1,123 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-open class FmtBase {
-    fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, 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(config.server),
-            config.serverPort
-        )
-
-        return "${url}${query}#${Utils.urlEncode(config.remarks)}"
-    }
-
-    fun getQueryParam(uri: URI): Map<String, String> {
-        return uri.rawQuery.split("&")
-            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
-    }
-
-    fun getItemFormQuery(config: ProfileItem, queryParam: Map<String, String>, allowInsecure: Boolean) {
-        config.network = queryParam["type"] ?: NetworkType.TCP.type
-        //TODO
-        if (config.network == NetworkType.SPLIT_HTTP.type) config.network = NetworkType.XHTTP.type
-        config.headerType = queryParam["headerType"]
-        config.host = queryParam["host"]
-        config.path = queryParam["path"]
-
-        config.seed = queryParam["seed"]
-        config.quicSecurity = queryParam["quicSecurity"]
-        config.quicKey = queryParam["key"]
-        config.mode = queryParam["mode"]
-        config.serviceName = queryParam["serviceName"]
-        config.authority = queryParam["authority"]
-        config.xhttpMode = queryParam["mode"]
-        config.xhttpExtra = queryParam["extra"]
-
-        config.security = queryParam["security"]
-        config.insecure = if (queryParam["allowInsecure"].isNullOrEmpty()) {
-            allowInsecure
-        } else {
-            queryParam["allowInsecure"].orEmpty() == "1"
-        }
-        config.sni = queryParam["sni"]
-        config.fingerPrint = queryParam["fp"]
-        config.alpn = queryParam["alpn"]
-        config.publicKey = queryParam["pbk"]
-        config.shortId = queryParam["sid"]
-        config.spiderX = queryParam["spx"]
-        config.flow = queryParam["flow"]
-    }
-
-    fun getQueryDic(config: ProfileItem): HashMap<String, String> {
-        val dicQuery = HashMap<String, String>()
-        dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
-        config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
-        config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
-        config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
-        config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
-        config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }
-
-        val networkType = NetworkType.fromString(config.network)
-        dicQuery["type"] = networkType.type
-
-        when (networkType) {
-            NetworkType.TCP -> {
-                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
-            }
-
-            NetworkType.KCP -> {
-                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
-            }
-
-            NetworkType.WS, NetworkType.HTTP_UPGRADE -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
-            }
-
-            NetworkType.SPLIT_HTTP, NetworkType.XHTTP -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
-                config.xhttpMode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
-                config.xhttpExtra.let { if (it.isNotNullEmpty()) dicQuery["extra"] = it.orEmpty() }
-            }
-
-            NetworkType.HTTP, NetworkType.H2 -> {
-                dicQuery["type"] = "http"
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
-            }
-
-//            NetworkType.QUIC -> {
-//                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-//                config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
-//                config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
-//            }
-
-            NetworkType.GRPC -> {
-                config.mode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
-                config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
-                config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
-            }
-        }
-
-        return dicQuery
-    }
-
-}
@@ -1,28 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.isNotNullEmpty
-import kotlin.text.orEmpty
-
-object HttpFmt : FmtBase() {
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HTTP)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            if (profileItem.username.isNotNullEmpty()) {
-                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
-                socksUsersBean.user = profileItem.username.orEmpty()
-                socksUsersBean.pass = profileItem.password.orEmpty()
-                server.users = listOf(socksUsersBean)
-            }
-        }
-
-        return outboundBean
-    }
-
-
-}
@@ -1,120 +0,0 @@
-package com.v2ray.ang.fmt
-
-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.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object Hysteria2Fmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.HYSTERIA2)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-        config.security = AppConfig.TLS
-
-        if (!uri.rawQuery.isNullOrEmpty()) {
-            val queryParam = getQueryParam(uri)
-
-            config.security = queryParam["security"] ?: AppConfig.TLS
-            config.insecure = if (queryParam["insecure"].isNullOrEmpty()) {
-                allowInsecure
-            } else {
-                queryParam["insecure"].orEmpty() == "1"
-            }
-            config.sni = queryParam["sni"]
-            config.alpn = queryParam["alpn"]
-
-            config.obfsPassword = queryParam["obfs-password"]
-            config.portHopping = queryParam["mport"]
-            config.pinSHA256 = queryParam["pinSHA256"]
-
-        }
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = HashMap<String, String>()
-
-        config.security.let { if (it != null) dicQuery["security"] = it }
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
-        config.insecure.let { dicQuery["insecure"] = if (it == true) "1" else "0" }
-
-        if (config.obfsPassword.isNotNullEmpty()) {
-            dicQuery["obfs"] = "salamander"
-            dicQuery["obfs-password"] = config.obfsPassword.orEmpty()
-        }
-        if (config.portHopping.isNotNullEmpty()) {
-            dicQuery["mport"] = config.portHopping.orEmpty()
-        }
-        if (config.pinSHA256.isNotNullEmpty()) {
-            dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
-        }
-
-        return toUri(config, config.password, dicQuery)
-    }
-
-    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
-
-        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
-            Hysteria2Bean.ObfsBean(
-                type = "salamander",
-                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
-                    password = config.obfsPassword
-                )
-            )
-
-        val transport = if (config.portHopping.isNullOrEmpty()) null else
-            Hysteria2Bean.TransportBean(
-                type = "udp",
-                udp = Hysteria2Bean.TransportBean.TransportUdpBean(
-                    hopInterval = (config.portHoppingInterval ?: "30") + "s"
-                )
-            )
-
-        val server =
-            if (config.portHopping.isNullOrEmpty())
-                config.getServerAddressAndPort()
-            else
-                Utils.getIpv6Address(config.server) + ":" + config.portHopping
-
-        val bean = Hysteria2Bean(
-            server = server,
-            auth = config.password,
-            obfs = obfs,
-            transport = transport,
-            socks5 = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            http = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            tls = Hysteria2Bean.TlsBean(
-                sni = config.sni ?: config.server,
-                insecure = config.insecure,
-                pinSHA256 = if (config.pinSHA256.isNullOrEmpty()) null else config.pinSHA256
-            )
-        )
-        return bean
-    }
-
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HYSTERIA2)
-        return outboundBean
-    }
-
-}
@@ -1,139 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object ShadowsocksFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        return parseSip002(str) ?: parseLegacy(str)
-    }
-
-    fun parseSip002(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.idnHost.isEmpty()) return null
-        if (uri.port <= 0) return null
-        if (uri.userInfo.isNullOrEmpty()) return null
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-
-        val result = if (uri.userInfo.contains(":")) {
-            uri.userInfo.split(":", limit = 2)
-        } else {
-            Utils.decode(uri.userInfo).split(":", limit = 2)
-        }
-        if (result.count() == 2) {
-            config.method = result.first()
-            config.password = result.last()
-        }
-
-        if (!uri.rawQuery.isNullOrEmpty()) {
-            val queryParam = getQueryParam(uri)
-            if (queryParam["plugin"]?.contains("obfs=http") == true) {
-                val queryPairs = HashMap<String, String>()
-                for (pair in queryParam["plugin"]?.split(";") ?: listOf()) {
-                    val idx = pair.split("=")
-                    if (idx.count() == 2) {
-                        queryPairs.put(idx.first(), idx.last())
-                    }
-                }
-                config.network = NetworkType.TCP.type
-                config.headerType = "http"
-                config.host = queryPairs["obfs-host"]
-                config.path = queryPairs["path"]
-            }
-        }
-
-        return config
-    }
-
-    fun parseLegacy(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
-        var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
-        val indexSplit = result.indexOf("#")
-        if (indexSplit > 0) {
-            try {
-                config.remarks =
-                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-            result = result.substring(0, indexSplit)
-        }
-
-        //part decode
-        val indexS = result.indexOf("@")
-        result = if (indexS > 0) {
-            Utils.decode(result.substring(0, indexS)) + result.substring(
-                indexS,
-                result.length
-            )
-        } else {
-            Utils.decode(result)
-        }
-
-        val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)/?$".toRegex()
-        val match = legacyPattern.matchEntire(result) ?: return null
-
-        config.server = match.groupValues[3].removeSurrounding("[", "]")
-        config.serverPort = match.groupValues[4]
-        config.password = match.groupValues[2]
-        config.method = match.groupValues[1].lowercase()
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val pw = "${config.method}:${config.password}"
-
-        return toUri(config, Utils.encode(pw), null)
-    }
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            server.password = profileItem.password
-            server.method = profileItem.method
-        }
-
-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-
-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
-
-        return outboundBean
-    }
-
-
-}
@@ -1,62 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.util.Utils
-import java.net.URI
-import kotlin.text.orEmpty
-
-object SocksFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SOCKS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.idnHost.isEmpty()) return null
-        if (uri.port <= 0) return null
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-
-        if (uri.userInfo?.isEmpty() == false) {
-            val result = Utils.decode(uri.userInfo).split(":", limit = 2)
-            if (result.count() == 2) {
-                config.username = result.first()
-                config.password = result.last()
-            }
-        }
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val pw =
-            if (config.username.isNotNullEmpty())
-                "${config.username}:${config.password}"
-            else
-                ":"
-
-        return toUri(config, Utils.encode(pw), null)
-    }
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SOCKS)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            if (profileItem.username.isNotNullEmpty()) {
-                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
-                socksUsersBean.user = profileItem.username.orEmpty()
-                socksUsersBean.pass = profileItem.password.orEmpty()
-                server.users = listOf(socksUsersBean)
-            }
-        }
-
-        return outboundBean
-    }
-
-}
@@ -1,81 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-import kotlin.text.orEmpty
-
-object TrojanFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.TROJAN)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-
-        if (uri.rawQuery.isNullOrEmpty()) {
-            config.network = NetworkType.TCP.type
-            config.security = AppConfig.TLS
-            config.insecure = allowInsecure
-        } else {
-            val queryParam = getQueryParam(uri)
-
-            getItemFormQuery(config, queryParam, allowInsecure)
-            config.security = queryParam["security"] ?: AppConfig.TLS
-        }
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = getQueryDic(config)
-
-        return toUri(config, config.password, dicQuery)
-    }
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.TROJAN)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            server.password = profileItem.password
-            server.flow = profileItem.flow
-        }
-
-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-
-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
-
-        return outboundBean
-    }
-}
@@ -1,83 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object VlessFmt : FmtBase() {
-
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VLESS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.rawQuery.isNullOrEmpty()) return null
-        val queryParam = getQueryParam(uri)
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-        config.method = queryParam["encryption"] ?: "none"
-
-        getItemFormQuery(config, queryParam, allowInsecure)
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = getQueryDic(config)
-        dicQuery["encryption"] = config.method ?: "none"
-
-        return toUri(config, config.password, dicQuery)
-    }
-
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VLESS)
-
-        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
-            vnext.port = profileItem.serverPort.orEmpty().toInt()
-            vnext.users[0].id = profileItem.password.orEmpty()
-            vnext.users[0].encryption = profileItem.method
-            vnext.users[0].flow = profileItem.flow
-        }
-
-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-        outboundBean?.streamSettings?.xhttpSettings?.mode = profileItem.xhttpMode
-        outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra)
-
-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
-
-        return outboundBean
-    }
-
-
-}
@@ -1,183 +0,0 @@
-package com.v2ray.ang.fmt
-
-import android.text.TextUtils
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.dto.VmessQRCode
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import java.net.URI
-import kotlin.text.orEmpty
-
-object VmessFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
-            return parseVmessStd(str)
-        }
-
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VMESS)
-
-        var result = str.replace(EConfigType.VMESS.protocolScheme, "")
-        result = Utils.decode(result)
-        if (TextUtils.isEmpty(result)) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
-            return null
-        }
-        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)
-            || TextUtils.isEmpty(vmessQRCode.id)
-            || TextUtils.isEmpty(vmessQRCode.net)
-        ) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_incorrect_protocol")
-            return null
-        }
-
-        config.remarks = vmessQRCode.ps
-        config.server = vmessQRCode.add
-        config.serverPort = vmessQRCode.port
-        config.password = vmessQRCode.id
-        config.method = if (TextUtils.isEmpty(vmessQRCode.scy)) AppConfig.DEFAULT_SECURITY else vmessQRCode.scy
-
-        config.network = vmessQRCode.net ?: NetworkType.TCP.type
-        config.headerType = vmessQRCode.type
-        config.host = vmessQRCode.host
-        config.path = vmessQRCode.path
-
-        when (NetworkType.fromString(config.network)) {
-            NetworkType.KCP -> {
-                config.seed = vmessQRCode.path
-            }
-
-//            NetworkType.QUIC -> {
-//                config.quicSecurity = vmessQRCode.host
-//                config.quicKey = vmessQRCode.path
-//            }
-
-            NetworkType.GRPC -> {
-                config.mode = vmessQRCode.type
-                config.serviceName = vmessQRCode.path
-                config.authority = vmessQRCode.host
-            }
-            else -> {}
-        }
-
-        config.security = vmessQRCode.tls
-        config.insecure = allowInsecure
-        config.sni = vmessQRCode.sni
-        config.fingerPrint = vmessQRCode.fp
-        config.alpn = vmessQRCode.alpn
-
-        return config
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val vmessQRCode = VmessQRCode()
-
-        vmessQRCode.v = "2"
-        vmessQRCode.ps = config.remarks
-        vmessQRCode.add = config.server.orEmpty()
-        vmessQRCode.port = config.serverPort.orEmpty()
-        vmessQRCode.id = config.password.orEmpty()
-        vmessQRCode.scy = config.method.orEmpty()
-        vmessQRCode.aid = "0"
-
-        vmessQRCode.net = config.network.orEmpty()
-        vmessQRCode.type = config.headerType.orEmpty()
-        when (NetworkType.fromString(config.network)) {
-            NetworkType.KCP -> {
-                vmessQRCode.path = config.seed.orEmpty()
-            }
-
-//            NetworkType.QUIC -> {
-//                vmessQRCode.host = config.quicSecurity.orEmpty()
-//                vmessQRCode.path = config.quicKey.orEmpty()
-//            }
-
-            NetworkType.GRPC -> {
-                vmessQRCode.type = config.mode.orEmpty()
-                vmessQRCode.path = config.serviceName.orEmpty()
-                vmessQRCode.host = config.authority.orEmpty()
-            }
-            else -> {}
-        }
-
-        config.host.let { if (it.isNotNullEmpty()) vmessQRCode.host = it.orEmpty() }
-        config.path.let { if (it.isNotNullEmpty()) vmessQRCode.path = it.orEmpty() }
-
-        vmessQRCode.tls = config.security.orEmpty()
-        vmessQRCode.sni = config.sni.orEmpty()
-        vmessQRCode.fp = config.fingerPrint.orEmpty()
-        vmessQRCode.alpn = config.alpn.orEmpty()
-
-        val json = JsonUtil.toJson(vmessQRCode)
-        return Utils.encode(json)
-    }
-
-    fun parseVmessStd(str: String): ProfileItem? {
-        val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VMESS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.rawQuery.isNullOrEmpty()) return null
-        val queryParam = getQueryParam(uri)
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-        config.method = AppConfig.DEFAULT_SECURITY
-
-        getItemFormQuery(config, queryParam, allowInsecure)
-
-        return config
-    }
-
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VMESS)
-
-        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
-            vnext.port = profileItem.serverPort.orEmpty().toInt()
-            vnext.users[0].id = profileItem.password.orEmpty()
-            vnext.users[0].security = profileItem.method
-        }
-
-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-
-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            null,
-            null,
-            null
-        )
-
-        return outboundBean
-    }
-
-}
@@ -1,124 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.util.Utils
-import java.net.URI
-import kotlin.text.orEmpty
-
-object WireguardFmt : FmtBase() {
-    fun parse(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.WIREGUARD)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.rawQuery.isNullOrEmpty()) return null
-        val queryParam = getQueryParam(uri)
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-
-        config.secretKey = uri.userInfo.orEmpty()
-        config.localAddress = (queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4)
-        config.publicKey = queryParam["publickey"].orEmpty()
-        config.preSharedKey = queryParam["presharedkey"].orEmpty()
-        config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
-        config.reserved = (queryParam["reserved"] ?: "0,0,0")
-
-        return config
-    }
-
-    fun parseWireguardConfFile(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.WIREGUARD)
-
-        val interfaceParams: MutableMap<String, String> = mutableMapOf()
-        val peerParams: MutableMap<String, String> = mutableMapOf()
-
-        var currentSection: String? = null
-
-        str.lines().forEach { line ->
-            val trimmedLine = line.trim()
-
-            if (trimmedLine.isEmpty() || trimmedLine.startsWith("#")) {
-                return@forEach
-            }
-
-            when {
-                trimmedLine.startsWith("[Interface]", ignoreCase = true) -> currentSection = "Interface"
-                trimmedLine.startsWith("[Peer]", ignoreCase = true) -> currentSection = "Peer"
-                else -> {
-                    if (currentSection != null) {
-                        val parts = trimmedLine.split("=", limit = 2).map { it.trim() }
-                        if (parts.size == 2) {
-                            val key = parts[0].lowercase()
-                            val value = parts[1]
-                            when (currentSection) {
-                                "Interface" -> interfaceParams[key] = value
-                                "Peer" -> peerParams[key] = value
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        config.secretKey = interfaceParams["privatekey"].orEmpty()
-        config.remarks = System.currentTimeMillis().toString()
-        config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
-        config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
-        config.publicKey = peerParams["publickey"].orEmpty()
-        config.preSharedKey = peerParams["presharedkey"].orEmpty()
-        val endpoint = peerParams["endpoint"].orEmpty()
-        val endpointParts = endpoint.split(":", limit = 2)
-        if (endpointParts.size == 2) {
-            config.server = endpointParts[0]
-            config.serverPort = endpointParts[1]
-        } else {
-            config.server = endpoint
-            config.serverPort = ""
-        }
-        config.reserved = peerParams["reserved"] ?: "0,0,0"
-
-        return config
-    }
-
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.WIREGUARD)
-
-        outboundBean?.settings?.let { wireguard ->
-            wireguard.secretKey = profileItem.secretKey
-            wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
-            wireguard.peers?.firstOrNull()?.let { peer ->
-                peer.publicKey = profileItem.publicKey.orEmpty()
-                peer.preSharedKey = profileItem.preSharedKey.orEmpty()
-                peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
-            }
-            wireguard.mtu = profileItem.mtu
-            wireguard.reserved = profileItem.reserved?.split(",")?.map { it.toInt() }
-        }
-
-        return outboundBean
-    }
-
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = HashMap<String, String>()
-
-        dicQuery["publickey"] = config.publicKey.orEmpty()
-        if (config.reserved != null) {
-            dicQuery["reserved"] = Utils.removeWhiteSpace(config.reserved).orEmpty()
-        }
-        dicQuery["address"] = Utils.removeWhiteSpace(config.localAddress).orEmpty()
-        if (config.mtu != null) {
-            dicQuery["mtu"] = config.mtu.toString()
-        }
-        if (config.preSharedKey != null) {
-            dicQuery["presharedkey"] = Utils.removeWhiteSpace(config.preSharedKey).orEmpty()
-        }
-
-        return toUri(config, config.secretKey, dicQuery)
-    }
-}
@@ -1,399 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.text.TextUtils
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.HY2
-import com.v2ray.ang.R
-import com.v2ray.ang.dto.*
-import com.v2ray.ang.fmt.CustomFmt
-import com.v2ray.ang.fmt.Hysteria2Fmt
-import com.v2ray.ang.fmt.ShadowsocksFmt
-import com.v2ray.ang.fmt.SocksFmt
-import com.v2ray.ang.fmt.TrojanFmt
-import com.v2ray.ang.fmt.VlessFmt
-import com.v2ray.ang.fmt.VmessFmt
-import com.v2ray.ang.fmt.WireguardFmt
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.QRCodeDecoder
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object AngConfigManager {
-    /**
-     * parse config form qrcode or...
-     */
-    private fun parseConfig(
-        str: String?,
-        subid: String,
-        subItem: SubscriptionItem?,
-        removedSelectedServer: ProfileItem?
-    ): Int {
-        try {
-            if (str == null || TextUtils.isEmpty(str)) {
-                return R.string.toast_none_data
-            }
-
-            val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) {
-                VmessFmt.parse(str)
-            } else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
-                ShadowsocksFmt.parse(str)
-            } else if (str.startsWith(EConfigType.SOCKS.protocolScheme)) {
-                SocksFmt.parse(str)
-            } else if (str.startsWith(EConfigType.TROJAN.protocolScheme)) {
-                TrojanFmt.parse(str)
-            } else if (str.startsWith(EConfigType.VLESS.protocolScheme)) {
-                VlessFmt.parse(str)
-            } else if (str.startsWith(EConfigType.WIREGUARD.protocolScheme)) {
-                WireguardFmt.parse(str)
-            } else if (str.startsWith(EConfigType.HYSTERIA2.protocolScheme) || str.startsWith(HY2)) {
-                Hysteria2Fmt.parse(str)
-            } else {
-                null
-            }
-
-            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 &&
-                config.server == removedSelectedServer.server && config.serverPort == removedSelectedServer.serverPort
-            ) {
-                MmkvManager.setSelectServer(guid)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    /**
-     * share config
-     */
-    private fun shareConfig(guid: String): String {
-        try {
-            val config = MmkvManager.decodeServerConfig(guid) ?: return ""
-
-            return config.configType.protocolScheme + when (config.configType) {
-                EConfigType.VMESS -> VmessFmt.toUri(config)
-                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()
-            return ""
-        }
-    }
-
-    /**
-     * share2Clipboard
-     */
-    fun share2Clipboard(context: Context, guid: String): Int {
-        try {
-            val conf = shareConfig(guid)
-            if (TextUtils.isEmpty(conf)) {
-                return -1
-            }
-
-            Utils.setClipboard(context, conf)
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    /**
-     * share2Clipboard
-     */
-    fun shareNonCustomConfigsToClipboard(context: Context, serverList: List<String>): Int {
-        try {
-            val sb = StringBuilder()
-            for (guid in serverList) {
-                val url = shareConfig(guid)
-                if (TextUtils.isEmpty(url)) {
-                    continue
-                }
-                sb.append(url)
-                sb.appendLine()
-            }
-            if (sb.count() > 0) {
-                Utils.setClipboard(context, sb.toString())
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    /**
-     * share2QRCode
-     */
-    fun share2QRCode(guid: String): Bitmap? {
-        try {
-            val conf = shareConfig(guid)
-            if (TextUtils.isEmpty(conf)) {
-                return null
-            }
-            return QRCodeDecoder.createQRCode(conf)
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return null
-        }
-    }
-
-    /**
-     * shareFullContent2Clipboard
-     */
-    fun shareFullContent2Clipboard(context: Context, guid: String?): Int {
-        try {
-            if (guid == null) return -1
-            val result = V2rayConfigManager.getV2rayConfig(context, guid)
-            if (result.status) {
-                Utils.setClipboard(context, result.content)
-            } else {
-                return -1
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    fun importBatchConfig(server: String?, subid: String, append: Boolean): Pair<Int, Int> {
-        var count = parseBatchConfig(Utils.decode(server), subid, append)
-        if (count <= 0) {
-            count = parseBatchConfig(server, subid, append)
-        }
-        if (count <= 0) {
-            count = parseCustomConfigServer(server, subid)
-        }
-
-        var countSub = parseBatchSubscription(server)
-        if (countSub <= 0) {
-            countSub = parseBatchSubscription(Utils.decode(server))
-        }
-        if (countSub > 0) {
-            updateConfigViaSubAll()
-        }
-
-        return count to countSub
-    }
-
-    fun parseBatchSubscription(servers: String?): Int {
-        try {
-            if (servers == null) {
-                return 0
-            }
-
-            var count = 0
-            servers.lines()
-                .distinct()
-                .forEach { str ->
-                    if (Utils.isValidSubUrl(str)) {
-                        count += importUrlAsSubscription(str)
-                    }
-                }
-            return count
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return 0
-    }
-
-    fun parseBatchConfig(servers: String?, subid: String, append: Boolean): Int {
-        try {
-            if (servers == null) {
-                return 0
-            }
-            val removedSelectedServer =
-                if (!TextUtils.isEmpty(subid) && !append) {
-                    MmkvManager.decodeServerConfig(
-                        MmkvManager.getSelectServer().orEmpty()
-                    )?.let {
-                        if (it.subscriptionId == subid) {
-                            return@let it
-                        }
-                        return@let null
-                    }
-                } else {
-                    null
-                }
-            if (!append) {
-                MmkvManager.removeServerViaSubid(subid)
-            }
-
-            val subItem = MmkvManager.decodeSubscription(subid)
-            var count = 0
-            servers.lines()
-                .distinct()
-                .reversed()
-                .forEach {
-                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
-                    if (resId == 0) {
-                        count++
-                    }
-                }
-            return count
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return 0
-    }
-
-    fun parseCustomConfigServer(server: String?, subid: String): Int {
-        if (server == null) {
-            return 0
-        }
-        if (server.contains("inbounds")
-            && server.contains("outbounds")
-            && server.contains("routing")
-        ) {
-            try {
-                val serverList: Array<Any> =
-                    JsonUtil.fromJson(server, Array<Any>::class.java)
-
-                if (serverList.isNotEmpty()) {
-                    var count = 0
-                    for (srv in serverList.reversed()) {
-                        val config = CustomFmt.parse(JsonUtil.toJson(srv)) ?: continue
-                        config.subscriptionId = subid
-                        val key = MmkvManager.encodeServerConfig("", config)
-                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv)?:"")
-                        count += 1
-                    }
-                    return count
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-            try {
-                // For compatibility
-                val config = CustomFmt.parse(server) ?: return 0
-                config.subscriptionId = subid
-                val key = MmkvManager.encodeServerConfig("", config)
-                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
-                val key = MmkvManager.encodeServerConfig("", config)
-                MmkvManager.encodeServerRaw(key, server)
-                return 1
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            return 0
-        } else {
-            return 0
-        }
-    }
-
-    fun updateConfigViaSubAll(): Int {
-        var count = 0
-        try {
-            MmkvManager.decodeSubscriptions().forEach {
-                count += updateConfigViaSub(it)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return 0
-        }
-        return count
-    }
-
-    fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
-        try {
-            if (TextUtils.isEmpty(it.first)
-                || TextUtils.isEmpty(it.second.remarks)
-                || TextUtils.isEmpty(it.second.url)
-            ) {
-                return 0
-            }
-            if (!it.second.enabled) {
-                return 0
-            }
-            val url = Utils.idnToASCII(it.second.url)
-            if (!Utils.isValidUrl(url)) {
-                return 0
-            }
-            Log.d(AppConfig.ANG_PACKAGE, url)
-
-            var configText = try {
-                val httpPort = SettingsManager.getHttpPort()
-                Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
-            } catch (e: Exception) {
-                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
-                //e.printStackTrace()
-                ""
-            }
-            if (configText.isEmpty()) {
-                configText = try {
-                    Utils.getUrlContentWithCustomUserAgent(url)
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    ""
-                }
-            }
-            if (configText.isEmpty()) {
-                return 0
-            }
-            return parseConfigViaSub(configText, it.first, false)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return 0
-        }
-    }
-
-    private fun parseConfigViaSub(server: String?, subid: String, append: Boolean): Int {
-        var count = parseBatchConfig(Utils.decode(server), subid, append)
-        if (count <= 0) {
-            count = parseBatchConfig(server, subid, append)
-        }
-        if (count <= 0) {
-            count = parseCustomConfigServer(server, subid)
-        }
-        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
-    }
-}
@@ -1,191 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.util.Log
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-
-object MigrateManager {
-    private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
-    private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-
-    fun migrateServerConfig2Profile(): Boolean {
-        if (serverStorage.count().toInt() == 0) {
-            return false
-        }
-        val serverList = serverStorage.allKeys() ?: return false
-        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + serverList.count())
-
-        for (guid in serverList) {
-            var configOld = decodeServerConfigOld(guid) ?: continue
-            var config = decodeServerConfig(guid)
-            if (config != null) {
-                serverStorage.remove(guid)
-                continue
-            }
-            config = migrateServerConfig2ProfileSub(configOld) ?: continue
-            config.subscriptionId = configOld.subscriptionId
-
-            MmkvManager.encodeServerConfig(guid, config)
-
-            //check and remove old
-            decodeServerConfig(guid) ?: continue
-            serverStorage.remove(guid)
-            Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + config.remarks)
-        }
-        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-end")
-        return true
-    }
-
-    private fun migrateServerConfig2ProfileSub(configOld: ServerConfig): ProfileItem? {
-        return when (configOld.getProxyOutbound()?.protocol) {
-            EConfigType.VMESS.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.VLESS.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.TROJAN.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.SHADOWSOCKS.name.lowercase() -> migrate2ProfileCommon(configOld)
-
-            EConfigType.SOCKS.name.lowercase() -> migrate2ProfileSocks(configOld)
-            EConfigType.HTTP.name.lowercase() -> migrate2ProfileHttp(configOld)
-            EConfigType.WIREGUARD.name.lowercase() -> migrate2ProfileWireguard(configOld)
-            EConfigType.HYSTERIA2.name.lowercase() -> migrate2ProfileHysteria2(configOld)
-
-            EConfigType.CUSTOM.name.lowercase() -> migrate2ProfileCustom(configOld)
-
-            else -> null
-        }
-    }
-
-    private fun migrate2ProfileCommon(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(configOld.configType)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.method = outbound.getSecurityEncryption()
-        config.password = outbound.getPassword()
-        config.flow = outbound?.settings?.vnext?.first()?.users?.first()?.flow ?: outbound?.settings?.servers?.first()?.flow
-
-        config.network = outbound?.streamSettings?.network ?: NetworkType.TCP.type
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            config.headerType = transportDetails[0].orEmpty()
-            config.host = transportDetails[1].orEmpty()
-            config.path = transportDetails[2].orEmpty()
-        }
-
-        config.seed = outbound?.streamSettings?.kcpSettings?.seed
-        config.quicSecurity = outbound?.streamSettings?.quicSettings?.security
-        config.quicKey = outbound?.streamSettings?.quicSettings?.key
-        config.mode = if (outbound?.streamSettings?.grpcSettings?.multiMode == true) "multi" else "gun"
-        config.serviceName = outbound?.streamSettings?.grpcSettings?.serviceName
-        config.authority = outbound?.streamSettings?.grpcSettings?.authority
-
-        config.security = outbound.streamSettings?.security
-        val tlsSettings = outbound?.streamSettings?.realitySettings ?: outbound?.streamSettings?.tlsSettings
-        config.insecure = tlsSettings?.allowInsecure
-        config.sni = tlsSettings?.serverName
-        config.fingerPrint = tlsSettings?.fingerprint
-        config.alpn = Utils.removeWhiteSpace(tlsSettings?.alpn?.joinToString(",")).toString()
-
-        config.publicKey = tlsSettings?.publicKey
-        config.shortId = tlsSettings?.shortId
-        config.spiderX = tlsSettings?.spiderX
-
-        return config
-    }
-
-    private fun migrate2ProfileSocks(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SOCKS)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.username = outbound.settings?.servers?.first()?.users?.first()?.user
-        config.password = outbound.getPassword()
-
-        return config
-    }
-
-    private fun migrate2ProfileHttp(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.HTTP)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.username = outbound.settings?.servers?.first()?.users?.first()?.user
-        config.password = outbound.getPassword()
-
-        return config
-    }
-
-    private fun migrate2ProfileWireguard(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.WIREGUARD)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-
-        outbound.settings?.let { wireguard ->
-            config.secretKey = wireguard.secretKey
-            config.localAddress = Utils.removeWhiteSpace((wireguard.address as List<*>).joinToString(",")).toString()
-            config.publicKey = wireguard.peers?.getOrNull(0)?.publicKey
-            config.mtu = wireguard.mtu
-            config.reserved = Utils.removeWhiteSpace(wireguard.reserved?.joinToString(",")).toString()
-        }
-        return config
-    }
-
-    private fun migrate2ProfileHysteria2(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.HYSTERIA2)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.password = outbound.getPassword()
-
-        config.security = AppConfig.TLS
-        outbound.streamSettings?.tlsSettings?.let { tlsSetting ->
-            config.insecure = tlsSetting.allowInsecure
-            config.sni = tlsSetting.serverName
-            config.alpn = Utils.removeWhiteSpace(tlsSetting.alpn?.joinToString(",")).orEmpty()
-
-        }
-        config.obfsPassword = outbound.settings?.obfsPassword
-
-        return config
-    }
-
-    private fun migrate2ProfileCustom(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.CUSTOM)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-
-        return config
-    }
-
-
-    private fun decodeServerConfigOld(guid: String): ServerConfig? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = serverStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ServerConfig::class.java)
-    }
-}
@@ -1,368 +0,0 @@
-package com.v2ray.ang.handler
-
-
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
-import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
-import com.v2ray.ang.dto.AssetUrlItem
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.ServerAffiliationInfo
-import com.v2ray.ang.dto.SubscriptionItem
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-
-object MmkvManager {
-
-    //region private
-
-    //private const val ID_PROFILE_CONFIG = "PROFILE_CONFIG"
-    private const val ID_MAIN = "MAIN"
-    private const val ID_PROFILE_FULL_CONFIG = "PROFILE_FULL_CONFIG"
-    private const val ID_SERVER_RAW = "SERVER_RAW"
-    private const val ID_SERVER_AFF = "SERVER_AFF"
-    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 profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-    private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    private val profileFullStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_FULL_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-    private val serverRawStorage by lazy { MMKV.mmkvWithID(ID_SERVER_RAW, 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 settingsStorage by lazy { MMKV.mmkvWithID(ID_SETTING, 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)
-        return if (json.isNullOrBlank()) {
-            mutableListOf()
-        } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
-        }
-    }
-
-
-    fun decodeServerConfig(guid: String): ProfileItem? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = profileFullStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ProfileItem::class.java)
-    }
-
-//    fun decodeProfileConfig(guid: String): ProfileLiteItem? {
-//        if (guid.isBlank()) {
-//            return null
-//        }
-//        val json = profileStorage.decodeString(guid)
-//        if (json.isNullOrBlank()) {
-//            return null
-//        }
-//        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
-//    }
-
-    fun encodeServerConfig(guid: String, config: ProfileItem): String {
-        val key = guid.ifBlank { Utils.getUuid() }
-        profileFullStorage.encode(key, JsonUtil.toJson(config))
-        val serverList = decodeServerList()
-        if (!serverList.contains(key)) {
-            serverList.add(0, key)
-            encodeServerList(serverList)
-            if (getSelectServer().isNullOrBlank()) {
-                mainStorage.encode(KEY_SELECTED_SERVER, key)
-            }
-        }
-//        val profile = ProfileLiteItem(
-//            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
-    }
-
-    fun removeServer(guid: String) {
-        if (guid.isBlank()) {
-            return
-        }
-        if (getSelectServer() == guid) {
-            mainStorage.remove(KEY_SELECTED_SERVER)
-        }
-        val serverList = decodeServerList()
-        serverList.remove(guid)
-        encodeServerList(serverList)
-        profileFullStorage.remove(guid)
-        //profileStorage.remove(guid)
-        serverAffStorage.remove(guid)
-    }
-
-    fun removeServerViaSubid(subid: String) {
-        if (subid.isBlank()) {
-            return
-        }
-        profileFullStorage.allKeys()?.forEach { key ->
-            decodeServerConfig(key)?.let { config ->
-                if (config.subscriptionId == subid) {
-                    removeServer(key)
-                }
-            }
-        }
-    }
-
-    fun decodeServerAffiliationInfo(guid: String): ServerAffiliationInfo? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = serverAffStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
-    }
-
-    fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
-        if (guid.isBlank()) {
-            return
-        }
-        val aff = decodeServerAffiliationInfo(guid) ?: ServerAffiliationInfo()
-        aff.testDelayMillis = testResult
-        serverAffStorage.encode(guid, JsonUtil.toJson(aff))
-    }
-
-    fun clearAllTestDelayResults(keys: List<String>?) {
-        keys?.forEach { key ->
-            decodeServerAffiliationInfo(key)?.let { aff ->
-                aff.testDelayMillis = 0
-                serverAffStorage.encode(key, JsonUtil.toJson(aff))
-            }
-        }
-    }
-
-    fun removeAllServer() {
-        mainStorage.clearAll()
-        profileFullStorage.clearAll()
-        //profileStorage.clearAll()
-        serverAffStorage.clearAll()
-    }
-
-    fun removeInvalidServer(guid: String) {
-        if (guid.isNotEmpty()) {
-            decodeServerAffiliationInfo(guid)?.let { aff ->
-                if (aff.testDelayMillis < 0L) {
-                    removeServer(guid)
-                }
-            }
-        } else {
-            serverAffStorage.allKeys()?.forEach { key ->
-                decodeServerAffiliationInfo(key)?.let { aff ->
-                    if (aff.testDelayMillis < 0L) {
-                        removeServer(key)
-                    }
-                }
-            }
-        }
-    }
-
-    fun encodeServerRaw(guid: String, config: String) {
-        serverRawStorage.encode(guid, config)
-    }
-
-    fun decodeServerRaw(guid: String): String? {
-        return serverRawStorage.decodeString(guid)
-    }
-
-    //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())
-            encodeSettings(PREF_ROUTING_RULESET, "")
-        else
-            encodeSettings(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
-    }
-
-    //endregion
-    fun encodeSettings(key: String, value: String?): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    fun encodeSettings(key: String, value: Int): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    fun encodeSettings(key: String, value: Boolean): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    fun encodeSettings(key: String, value: MutableSet<String>): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-
-    fun decodeSettingsString(key: String): String? {
-        return settingsStorage.decodeString(key)
-    }
-
-    fun decodeSettingsString(key: String, defaultValue: String?): String? {
-        return settingsStorage.decodeString(key, defaultValue)
-    }
-
-    fun decodeSettingsBool(key: String): Boolean {
-        return settingsStorage.decodeBool(key,false)
-    }
-
-    fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
-        return settingsStorage.decodeBool(key, defaultValue)
-    }
-
-    fun decodeSettingsInt(key: String, defaultValue: Int): Int {
-        return settingsStorage.decodeInt(key, defaultValue)
-    }
-
-    fun decodeSettingsStringSet(key: String): MutableSet<String>? {
-        return settingsStorage.decodeStringSet(key)
-    }
-
-    //endregion
-
-    //region Others
-
-    fun encodeStartOnBoot(startOnBoot: Boolean) {
-        MmkvManager.encodeSettings(PREF_IS_BOOTED, startOnBoot)
-    }
-
-    fun decodeStartOnBoot(): Boolean {
-        return decodeSettingsBool(PREF_IS_BOOTED, false)
-    }
-
-    //endregion
-
-}
@@ -1,186 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.content.Context
-import android.content.res.AssetManager
-import android.text.TextUtils
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-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.ProfileItem
-import com.v2ray.ang.dto.RoutingType
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerList
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.Utils.parseInt
-import java.io.File
-import java.io.FileOutputStream
-import java.util.Collections
-import kotlin.Int
-
-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 = RoutingType.fromIndex(index).fileName
-        val assets = Utils.readTextFromAssets(context, fileName)
-        if (TextUtils.isEmpty(assets)) {
-            return null
-        }
-
-        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
-    }
-
-
-    fun resetRoutingRulesetsFromPresets(context: Context, index: Int) {
-        val rulesetList = getPresetRoutingRulesets(context, index) ?: return
-        resetRoutingRulesetsCommon(rulesetList)
-    }
-
-    fun resetRoutingRulesets(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(0, 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?): ProfileItem? {
-        if (remarks == null) {
-            return null
-        }
-        val serverList = decodeServerList()
-        for (guid in serverList) {
-            val profile = decodeServerConfig(guid)
-            if (profile != null && profile.remarks == remarks) {
-                return profile
-            }
-        }
-        return null
-    }
-
-    fun getSocksPort(): Int {
-        return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
-    }
-
-    fun getHttpPort(): Int {
-        return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
-    }
-
-    fun initAssets(context: Context, assets: AssetManager) {
-        val extFolder = Utils.userAssetPath(context)
-
-        try {
-            val geo = arrayOf("geosite.dat", "geoip.dat")
-            assets.list("")
-                ?.filter { geo.contains(it) }
-                ?.filter { !File(extFolder, it).exists() }
-                ?.forEach {
-                    val target = File(extFolder, it)
-                    assets.open(it).use { input ->
-                        FileOutputStream(target).use { output ->
-                            input.copyTo(output)
-                        }
-                    }
-                    Log.i(
-                        ANG_PACKAGE,
-                        "Copied from apk assets folder to ${target.absolutePath}"
-                    )
-                }
-        } catch (e: Exception) {
-            Log.e(ANG_PACKAGE, "asset copy failed", e)
-        }
-
-    }
-}
@@ -1,635 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.content.Context
-import android.text.TextUtils
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.AppConfig.DEFAULT_NETWORK
-import com.v2ray.ang.AppConfig.DNS_ALIDNS_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_ALIDNS_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_DNSPOD_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_DNSPOD_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_GOOGLE_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_GOOGLE_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_QUAD9_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_QUAD9_DOMAIN
-import com.v2ray.ang.AppConfig.DNS_YANDEX_ADDRESSES
-import com.v2ray.ang.AppConfig.DNS_YANDEX_DOMAIN
-import com.v2ray.ang.AppConfig.GEOIP_CN
-import com.v2ray.ang.AppConfig.GEOSITE_CN
-import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
-import com.v2ray.ang.AppConfig.GOOGLEAPIS_CN_DOMAIN
-import com.v2ray.ang.AppConfig.GOOGLEAPIS_COM_DOMAIN
-import com.v2ray.ang.AppConfig.HEADER_TYPE_HTTP
-import com.v2ray.ang.AppConfig.LOOPBACK
-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.ProfileItem
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
-import com.v2ray.ang.fmt.HttpFmt
-import com.v2ray.ang.fmt.Hysteria2Fmt
-import com.v2ray.ang.fmt.ShadowsocksFmt
-import com.v2ray.ang.fmt.SocksFmt
-import com.v2ray.ang.fmt.TrojanFmt
-import com.v2ray.ang.fmt.VlessFmt
-import com.v2ray.ang.fmt.VmessFmt
-import com.v2ray.ang.fmt.WireguardFmt
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-
-object V2rayConfigManager {
-
-    fun getV2rayConfig(context: Context, guid: String): ConfigResult {
-        try {
-            val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
-            if (config.configType == EConfigType.CUSTOM) {
-                val raw = MmkvManager.decodeServerRaw(guid) ?: return ConfigResult(false)
-                val domainPort = config.getServerAddressAndPort()
-                return ConfigResult(true, guid, raw, domainPort)
-            }
-
-            val result = getV2rayNonCustomConfig(context, config)
-            //Log.d(ANG_PACKAGE, result.content)
-            result.guid = guid
-            return result
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return ConfigResult(false)
-        }
-    }
-
-    private fun getV2rayNonCustomConfig(context: Context, config: ProfileItem): ConfigResult {
-        val result = ConfigResult(false)
-
-        val address = config.server ?: return result
-        if (!Utils.isIpAddress(address)) {
-            if (!Utils.isValidUrl(address)) {
-                Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
-                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
-        v2rayConfig.log.loglevel =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
-        v2rayConfig.remarks = config.remarks
-
-        inbounds(v2rayConfig)
-
-        val isPlugin = config.configType == EConfigType.HYSTERIA2
-        val retOut = outbounds(v2rayConfig, config, isPlugin) ?: return result
-        val retMore = moreOutbounds(v2rayConfig, config.subscriptionId, isPlugin)
-
-        routing(v2rayConfig)
-
-        fakedns(v2rayConfig)
-
-        dns(v2rayConfig)
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-            customLocalDns(v2rayConfig)
-        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) {
-            v2rayConfig.stats = null
-            v2rayConfig.policy = null
-        }
-
-        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 = SettingsManager.getSocksPort()
-            val httpPort = SettingsManager.getHttpPort()
-
-            v2rayConfig.inbounds.forEach { curInbound ->
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
-                    //bind all inbounds to localhost if the user requests
-                    curInbound.listen = LOOPBACK
-                }
-            }
-            v2rayConfig.inbounds[0].port = socksPort
-            val fakedns = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
-            val sniffAllTlsAndHttp =
-                MmkvManager.decodeSettingsBool(AppConfig.PREF_SNIFFING_ENABLED, true) != false
-            v2rayConfig.inbounds[0].sniffing?.enabled = fakedns || sniffAllTlsAndHttp
-            v2rayConfig.inbounds[0].sniffing?.routeOnly =
-                MmkvManager.decodeSettingsBool(AppConfig.PREF_ROUTE_ONLY_ENABLED, false)
-            if (!sniffAllTlsAndHttp) {
-                v2rayConfig.inbounds[0].sniffing?.destOverride?.clear()
-            }
-            if (fakedns) {
-                v2rayConfig.inbounds[0].sniffing?.destOverride?.add("fakedns")
-            }
-
-            v2rayConfig.inbounds[1].port = httpPort
-
-//            if (httpPort > 0) {
-//                val httpCopy = v2rayConfig.inbounds[0].copy()
-//                httpCopy.port = httpPort
-//                httpCopy.protocol = "http"
-//                v2rayConfig.inbounds.add(httpCopy)
-//            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun outbounds(v2rayConfig: V2rayConfig, config: ProfileItem, 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 outbound = getProxyOutbound(config) ?: return null
-        val ret = updateOutboundWithGlobalSettings(outbound)
-        if (!ret) return null
-
-        if (v2rayConfig.outbounds.isNotEmpty()) {
-            v2rayConfig.outbounds[0] = outbound
-        } else {
-            v2rayConfig.outbounds.add(outbound)
-        }
-
-        updateOutboundFragment(v2rayConfig)
-        return Pair(true, config.getServerAddressAndPort())
-    }
-
-    private fun fakedns(v2rayConfig: V2rayConfig) {
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true
-            && MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
-        ) {
-            v2rayConfig.fakedns = listOf(V2rayConfig.FakednsBean())
-        }
-    }
-
-    private fun routing(v2rayConfig: V2rayConfig): Boolean {
-        try {
-
-            v2rayConfig.routing.domainStrategy =
-                MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY)
-                    ?: "IPIfNonMatch"
-
-            val rulesetItems = MmkvManager.decodeRoutingRulesets()
-            rulesetItems?.forEach { key ->
-                routingUserRule(key, v2rayConfig)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun routingUserRule(item: RulesetItem?, v2rayConfig: V2rayConfig) {
-        try {
-            if (item == null || !item.enabled) {
-                return
-            }
-
-            val rule = JsonUtil.fromJson(JsonUtil.toJson(item), RulesBean::class.java) ?: return
-
-            v2rayConfig.routing.rules.add(rule)
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun userRule2Domain(tag: String): ArrayList<String> {
-        val domain = ArrayList<String>()
-
-        val rulesetItems = MmkvManager.decodeRoutingRulesets()
-        rulesetItems?.forEach { key ->
-            if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
-                key.domain?.forEach {
-                    if (it != GEOSITE_PRIVATE
-                        && (it.startsWith("geosite:") || it.startsWith("domain:"))
-                    ) {
-                        domain.add(it)
-                    }
-                }
-            }
-        }
-
-        return domain
-    }
-
-    private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
-        try {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
-                val geositeCn = arrayListOf(GEOSITE_CN)
-                val proxyDomain = userRule2Domain(TAG_PROXY)
-                val directDomain = userRule2Domain(TAG_DIRECT)
-                // fakedns with all domains to make it always top priority
-                v2rayConfig.dns.servers?.add(
-                    0,
-                    V2rayConfig.DnsBean.ServersBean(
-                        address = "fakedns",
-                        domains = geositeCn.plus(proxyDomain).plus(directDomain)
-                    )
-                )
-            }
-
-            // DNS inbound对象
-            val remoteDns = Utils.getRemoteDnsServers()
-            if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
-                val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
-                    address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY,
-                    port = 53,
-                    network = "tcp,udp"
-                )
-
-                val localDnsPort = Utils.parseInt(
-                    MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT),
-                    AppConfig.PORT_LOCAL_DNS.toInt()
-                )
-                v2rayConfig.inbounds.add(
-                    V2rayConfig.InboundBean(
-                        tag = "dns-in",
-                        port = localDnsPort,
-                        listen = LOOPBACK,
-                        protocol = "dokodemo-door",
-                        settings = dnsInboundSettings,
-                        sniffing = null
-                    )
-                )
-            }
-
-            // DNS outbound对象
-            if (v2rayConfig.outbounds.none { e -> e.protocol == "dns" && e.tag == "dns-out" }) {
-                v2rayConfig.outbounds.add(
-                    V2rayConfig.OutboundBean(
-                        protocol = "dns",
-                        tag = "dns-out",
-                        settings = null,
-                        streamSettings = null,
-                        mux = null
-                    )
-                )
-            }
-
-            // DNS routing tag
-            v2rayConfig.routing.rules.add(
-                0, RulesBean(
-                    inboundTag = arrayListOf("dns-in"),
-                    outboundTag = "dns-out",
-                    domain = null
-                )
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun dns(v2rayConfig: V2rayConfig): Boolean {
-        try {
-            val hosts = mutableMapOf<String, Any>()
-            val servers = ArrayList<Any>()
-
-            //remote Dns
-            val remoteDns = Utils.getRemoteDnsServers()
-            val proxyDomain = userRule2Domain(TAG_PROXY)
-            remoteDns.forEach {
-                servers.add(it)
-            }
-            if (proxyDomain.size > 0) {
-                servers.add(
-                    V2rayConfig.DnsBean.ServersBean(
-                        address =  remoteDns.first(),
-                        domains =  proxyDomain,
-                    )
-                )
-            }
-
-            // domestic DNS
-            val domesticDns = Utils.getDomesticDnsServers()
-            val directDomain = userRule2Domain(TAG_DIRECT)
-            val isCnRoutingMode = directDomain.contains(GEOSITE_CN)
-            val geoipCn = arrayListOf(GEOIP_CN)
-            if (directDomain.size > 0) {
-                servers.add(
-                    V2rayConfig.DnsBean.ServersBean(
-                        address = domesticDns.first(),
-                        domains = directDomain,
-                        expectIPs = if (isCnRoutingMode) geoipCn else null,
-                        skipFallback = true
-                    )
-                )
-            }
-
-            if (Utils.isPureIpAddress(domesticDns.first())) {
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        outboundTag = TAG_DIRECT,
-                        port = "53",
-                        ip = arrayListOf(domesticDns.first()),
-                        domain = null
-                    )
-                )
-            }
-
-            //block dns
-            val blkDomain = userRule2Domain(TAG_BLOCKED)
-            if (blkDomain.size > 0) {
-                hosts.putAll(blkDomain.map { it to LOOPBACK })
-            }
-
-            // hardcode googleapi rule to fix play store problems
-            hosts[GOOGLEAPIS_CN_DOMAIN] = GOOGLEAPIS_COM_DOMAIN
-
-            // hardcode popular Android Private DNS rule to fix localhost DNS problem
-            hosts[DNS_ALIDNS_DOMAIN] = DNS_ALIDNS_ADDRESSES
-            hosts[DNS_CLOUDFLARE_DOMAIN] = DNS_CLOUDFLARE_ADDRESSES
-            hosts[DNS_DNSPOD_DOMAIN] = DNS_DNSPOD_ADDRESSES
-            hosts[DNS_GOOGLE_DOMAIN] = DNS_GOOGLE_ADDRESSES
-            hosts[DNS_QUAD9_DOMAIN] = DNS_QUAD9_ADDRESSES
-            hosts[DNS_YANDEX_DOMAIN] = DNS_YANDEX_ADDRESSES
-
-
-            // DNS dns对象
-            v2rayConfig.dns = V2rayConfig.DnsBean(
-                servers = servers,
-                hosts = hosts
-            )
-
-            // DNS routing
-            if (Utils.isPureIpAddress(remoteDns.first())) {
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        outboundTag = TAG_PROXY,
-                        port = "53",
-                        ip = arrayListOf(remoteDns.first()),
-                        domain = null
-                    )
-                )
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun updateOutboundWithGlobalSettings(outbound: V2rayConfig.OutboundBean): Boolean {
-        try {
-            var muxEnabled = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
-            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)
-                && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true
-            ) {
-                muxEnabled = false
-            }
-            if (muxEnabled == true) {
-                outbound.mux?.enabled = true
-                outbound.mux?.concurrency =
-                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_CONCURRENCY, 8)
-                outbound.mux?.xudpConcurrency =
-                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_XUDP_CONCURRENCY, 16)
-                outbound.mux?.xudpProxyUDP443 =
-                    MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC) ?: "reject"
-            } else {
-                outbound.mux?.enabled = false
-                outbound.mux?.concurrency = -1
-            }
-
-            if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                var localTunAddr = if (outbound.settings?.address == null) {
-                    listOf(WIREGUARD_LOCAL_ADDRESS_V4, WIREGUARD_LOCAL_ADDRESS_V6)
-                } else {
-                    outbound.settings?.address as List<*>
-                }
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) != true) {
-                    localTunAddr = listOf(localTunAddr.first())
-                }
-                outbound.settings?.address = localTunAddr
-            }
-
-            if (outbound.streamSettings?.network == DEFAULT_NETWORK
-                && outbound.streamSettings?.tcpSettings?.header?.type == HEADER_TYPE_HTTP
-            ) {
-                val path = outbound.streamSettings?.tcpSettings?.header?.request?.path
-                val host = outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host
-
-                val requestString: String by lazy {
-                    """{"version":"1.1","method":"GET","headers":{"User-Agent":["Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.122 Mobile Safari/537.36"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}"""
-                }
-                outbound.streamSettings?.tcpSettings?.header?.request = JsonUtil.fromJson(
-                    requestString,
-                    V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean.RequestBean::class.java
-                )
-                outbound.streamSettings?.tcpSettings?.header?.request?.path =
-                    if (path.isNullOrEmpty()) {
-                        listOf("/")
-                    } else {
-                        path
-                    }
-                outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host = host
-            }
-
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun updateOutboundFragment(v2rayConfig: V2rayConfig): Boolean {
-        try {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == false) {
-                return true
-            }
-            if (v2rayConfig.outbounds[0].streamSettings?.security != AppConfig.TLS
-                && v2rayConfig.outbounds[0].streamSettings?.security != AppConfig.REALITY
-            ) {
-                return true
-            }
-
-            val fragmentOutbound =
-                V2rayConfig.OutboundBean(
-                    protocol = PROTOCOL_FREEDOM,
-                    tag = TAG_FRAGMENT,
-                    mux = null
-                )
-
-            var packets =
-                MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS) ?: "tlshello"
-            if (v2rayConfig.outbounds[0].streamSettings?.security == AppConfig.REALITY
-                && packets == "tlshello"
-            ) {
-                packets = "1-3"
-            } else if (v2rayConfig.outbounds[0].streamSettings?.security == AppConfig.TLS
-                && packets != "tlshello"
-            ) {
-                packets = "tlshello"
-            }
-
-            fragmentOutbound.settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                fragment = V2rayConfig.OutboundBean.OutSettingsBean.FragmentBean(
-                    packets = packets,
-                    length = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH)
-                        ?: "50-100",
-                    interval = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL)
-                        ?: "10-20"
-                ),
-                noises = listOf(
-                    V2rayConfig.OutboundBean.OutSettingsBean.NoiseBean(
-                        type = "rand",
-                        packet = "10-20",
-                        delay = "10-16",
-                    )
-                ),
-            )
-            fragmentOutbound.streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean(
-                sockopt = V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
-                    TcpNoDelay = true,
-                    mark = 255
-                )
-            )
-            v2rayConfig.outbounds.add(fragmentOutbound)
-
-            //proxy chain
-            v2rayConfig.outbounds[0].streamSettings?.sockopt =
-                V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
-                    dialerProxy = TAG_FRAGMENT
-                )
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        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 (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) {
-            return returnPair
-        }
-
-        if (subscriptionId.isEmpty()) {
-            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 = getProxyOutbound(prevNode)
-                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 = prevNode.getServerAddressAndPort()
-                }
-            }
-
-            //Next proxy
-            val nextNode = SettingsManager.getServerViaRemarks(subItem.nextProfile)
-            if (nextNode != null) {
-                val nextOutbound = getProxyOutbound(nextNode)
-                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
-    }
-
-    fun getProxyOutbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? {
-        return when (profileItem.configType) {
-            EConfigType.VMESS -> VmessFmt.toOutbound(profileItem)
-            EConfigType.CUSTOM -> null
-            EConfigType.SHADOWSOCKS -> ShadowsocksFmt.toOutbound(profileItem)
-            EConfigType.SOCKS -> SocksFmt.toOutbound(profileItem)
-            EConfigType.VLESS -> VlessFmt.toOutbound(profileItem)
-            EConfigType.TROJAN -> TrojanFmt.toOutbound(profileItem)
-            EConfigType.WIREGUARD -> WireguardFmt.toOutbound(profileItem)
-            EConfigType.HYSTERIA2 -> Hysteria2Fmt.toOutbound(profileItem)
-            EConfigType.HTTP -> HttpFmt.toOutbound(profileItem)
-        }
-
-    }
-
-}
@@ -13,41 +13,46 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.v2ray.ang.helper
+
+package com.v2ray.ang.helper;
+
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;

 /**
- * Interface to listen for a move or dismissal event from a [ItemTouchHelper.Callback].
+ * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.
 *
 * @author Paul Burke (ipaulpro)
 */
-interface ItemTouchHelperAdapter {
+public interface ItemTouchHelperAdapter {
+
    /**
     * Called when an item has been dragged far enough to trigger a move. This is called every time
-     * an item is shifted, and **not** at the end of a "drop" event.<br></br>
-     * <br></br>
-     * Implementations should call [RecyclerView.Adapter.notifyItemMoved] after
+     * an item is shifted, and <strong>not</strong> at the end of a "drop" event.<br/>
+     * <br/>
+     * Implementations should call {@link RecyclerView.Adapter#notifyItemMoved(int, int)} after
     * adjusting the underlying data to reflect this move.
     *
     * @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
-     * @see RecyclerView.ViewHolder.getAdapterPosition
+     *
+     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
+     * @see RecyclerView.ViewHolder#getAdapterPosition()
     */
-    fun onItemMove(fromPosition: Int, toPosition: Int): Boolean
+    boolean onItemMove(int fromPosition, int toPosition);


-    fun onItemMoveCompleted()
-
    /**
-     * Called when an item has been dismissed by a swipe.<br></br>
-     * <br></br>
-     * Implementations should call [RecyclerView.Adapter.notifyItemRemoved] after
+     * Called when an item has been dismissed by a swipe.<br/>
+     * <br/>
+     * Implementations should call {@link RecyclerView.Adapter#notifyItemRemoved(int)} after
     * adjusting the underlying data to reflect this removal.
     *
     * @param position The position of the item dismissed.
-     * @see RecyclerView.getAdapterPositionFor
-     * @see RecyclerView.ViewHolder.getAdapterPosition
+     *
+     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
+     * @see RecyclerView.ViewHolder#getAdapterPosition()
     */
-    fun onItemDismiss(position: Int)
+    void onItemDismiss(int position);
 }
@@ -13,26 +13,29 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.v2ray.ang.helper

-import androidx.recyclerview.widget.ItemTouchHelper
+package com.v2ray.ang.helper;
+
+import android.support.v7.widget.helper.ItemTouchHelper;

 /**
- * Interface to notify an item ViewHolder of relevant callbacks from [ ].
+ * Interface to notify an item ViewHolder of relevant callbacks from {@link
+ * ItemTouchHelper.Callback}.
 *
 * @author Paul Burke (ipaulpro)
 */
-interface ItemTouchHelperViewHolder {
+public interface ItemTouchHelperViewHolder {
+
    /**
-     * Called when the [ItemTouchHelper] first registers an item as being moved or swiped.
+     * Called when the {@link ItemTouchHelper} first registers an item as being moved or swiped.
     * Implementations should update the item view to indicate it's active state.
     */
-    fun onItemSelected()
+    void onItemSelected();


    /**
-     * Called when the [ItemTouchHelper] has completed the move or swipe, and the active item
+     * Called when the {@link ItemTouchHelper} has completed the move or swipe, and the active item
     * state should be cleared.
     */
-    fun onItemClear()
+    void onItemClear();
 }
@@ -0,0 +1,33 @@
+/*
+ * 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 android.support.v7.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);
+
+}
@@ -0,0 +1,123 @@
+/*
+ * 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 android.graphics.Canvas;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+
+/**
+ * An implementation of {@link ItemTouchHelper.Callback} that enables basic drag & drop and
+ * swipe-to-dismiss. Drag events are automatically started by an item long-press.<br/>
+ * </br/>
+ * Expects the <code>RecyclerView.Adapter</code> to listen for {@link
+ * ItemTouchHelperAdapter} callbacks and the <code>RecyclerView.ViewHolder</code> to implement
+ * {@link ItemTouchHelperViewHolder}.
+ *
+ * @author Paul Burke (ipaulpro)
+ */
+public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
+
+    public static final float ALPHA_FULL = 1.0f;
+
+    private final ItemTouchHelperAdapter mAdapter;
+
+    public SimpleItemTouchHelperCallback(ItemTouchHelperAdapter adapter) {
+        mAdapter = adapter;
+    }
+
+    @Override
+    public boolean isLongPressDragEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isItemViewSwipeEnabled() {
+        return false;
+    }
+
+    @Override
+    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+        // Set movement flags based on the layout manager
+        if (recyclerView.getLayoutManager() instanceof GridLayoutManager) {
+            final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+            final int swipeFlags = 0;
+            return makeMovementFlags(dragFlags, swipeFlags);
+        } else {
+            final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+            final int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
+            return makeMovementFlags(dragFlags, swipeFlags);
+        }
+    }
+
+    @Override
+    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
+        if (source.getItemViewType() != target.getItemViewType()) {
+            return false;
+        }
+
+        // Notify the adapter of the move
+        mAdapter.onItemMove(source.getAdapterPosition(), target.getAdapterPosition());
+        return true;
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int i) {
+        // Notify the adapter of the dismissal
+        mAdapter.onItemDismiss(viewHolder.getAdapterPosition());
+    }
+
+    @Override
+    public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+            // Fade out the view as it is swiped out of the parent's bounds
+            final float alpha = ALPHA_FULL - Math.abs(dX) / (float) viewHolder.itemView.getWidth();
+            viewHolder.itemView.setAlpha(alpha);
+            viewHolder.itemView.setTranslationX(dX);
+        } else {
+            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+    }
+
+    @Override
+    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+        // We only want the active item to change
+        if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
+            if (viewHolder instanceof ItemTouchHelperViewHolder) {
+                // Let the view holder know that this item is being moved or dragged
+                ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
+                itemViewHolder.onItemSelected();
+            }
+        }
+
+        super.onSelectedChanged(viewHolder, actionState);
+    }
+
+    @Override
+    public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+        super.clearView(recyclerView, viewHolder);
+
+        viewHolder.itemView.setAlpha(ALPHA_FULL);
+
+        if (viewHolder instanceof ItemTouchHelperViewHolder) {
+            // Tell the view holder it's time to restore the idle state
+            ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
+            itemViewHolder.onItemClear();
+        }
+    }
+}
@@ -1,148 +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 android.animation.ValueAnimator
-import android.animation.ValueAnimator.AnimatorUpdateListener
-import android.graphics.Canvas
-import android.view.animation.DecelerateInterpolator
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.abs
-import kotlin.math.min
-import kotlin.math.sign
-
-/**
- * An implementation of [ItemTouchHelper.Callback] that enables basic drag & drop and
- * swipe-to-dismiss. Drag events are automatically started by an item long-press.<br></br>
- *
- * Expects the `RecyclerView.Adapter` to listen for [ ] callbacks and the `RecyclerView.ViewHolder` to implement
- * [ItemTouchHelperViewHolder].
- *
- * @author Paul Burke (ipaulpro)
- */
-class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter) : ItemTouchHelper.Callback() {
-    private var mReturnAnimator: ValueAnimator? = null
-
-    override fun isLongPressDragEnabled(): Boolean = true
-
-    override fun isItemViewSwipeEnabled(): Boolean = true
-
-    override fun getMovementFlags(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder
-    ): Int {
-        val dragFlags: Int
-        val swipeFlags: Int
-        if (recyclerView.layoutManager is GridLayoutManager) {
-            dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN or ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
-            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
-        } else {
-            dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN
-            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
-        }
-        return makeMovementFlags(dragFlags, swipeFlags)
-    }
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        source: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        return if (source.itemViewType != target.itemViewType) {
-            false
-        } else {
-            mAdapter.onItemMove(source.bindingAdapterPosition, target.bindingAdapterPosition)
-            true
-        }
-    }
-
-    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        // Do not delete; simply return item to original position
-        returnViewToOriginalPosition(viewHolder)
-    }
-
-    override fun onChildDraw(
-        c: Canvas, recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean
-    ) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            val maxSwipeDistance = viewHolder.itemView.width * SWIPE_THRESHOLD
-            val swipeAmount = abs(dX)
-            val direction = sign(dX)
-
-            // Limit maximum swipe distance
-            val translationX = min(swipeAmount, maxSwipeDistance) * direction
-            val alpha = ALPHA_FULL - min(swipeAmount, maxSwipeDistance) / maxSwipeDistance
-
-            viewHolder.itemView.translationX = translationX
-            viewHolder.itemView.alpha = alpha
-
-            if (swipeAmount >= maxSwipeDistance && isCurrentlyActive) {
-                returnViewToOriginalPosition(viewHolder)
-            }
-        } else {
-            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-        }
-    }
-
-    private fun returnViewToOriginalPosition(viewHolder: RecyclerView.ViewHolder) {
-        mReturnAnimator?.takeIf { it.isRunning }?.cancel()
-
-        mReturnAnimator = ValueAnimator.ofFloat(viewHolder.itemView.translationX, 0f).apply {
-            addUpdateListener { animation ->
-                val value = animation.animatedValue as Float
-                viewHolder.itemView.translationX = value
-                viewHolder.itemView.alpha = (1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD))
-            }
-            interpolator = DecelerateInterpolator()
-            duration = ANIMATION_DURATION
-            start()
-        }
-    }
-
-    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
-        if (actionState != ItemTouchHelper.ACTION_STATE_IDLE && viewHolder is ItemTouchHelperViewHolder) {
-            viewHolder.onItemSelected()
-        }
-        super.onSelectedChanged(viewHolder, actionState)
-    }
-
-    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
-        super.clearView(recyclerView, viewHolder)
-        viewHolder.itemView.alpha = ALPHA_FULL
-        if (viewHolder is ItemTouchHelperViewHolder) {
-            viewHolder.onItemClear()
-        }
-        mAdapter.onItemMoveCompleted()
-    }
-
-    override fun getSwipeThreshold(viewHolder: RecyclerView.ViewHolder): Float {
-        return 1.1f // Set a value greater than 1 to prevent default swipe delete
-    }
-
-    override fun getSwipeEscapeVelocity(defaultValue: Float): Float {
-        return defaultValue * 10 // Increase swipe escape velocity to make swipe harder to trigger
-    }
-
-    companion object {
-        private const val ALPHA_FULL = 1.0f
-        private const val SWIPE_THRESHOLD = 0.25f
-        private const val ANIMATION_DURATION: Long = 200
-    }
-}
@@ -1,32 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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!!
-}
@@ -1,43 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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()
-}
@@ -1,33 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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"
-}
@@ -1,54 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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))
-        }
-    }
-}
@@ -1,233 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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}")
-    }
-}
@@ -1,45 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * 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
-}
@@ -1,18 +0,0 @@
-package com.v2ray.ang.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.service.V2RayServiceManager
-
-class BootReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-        //Check if context is not null and action is the one we want
-        if (context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) return
-        //Check if flag is true and a server is selected
-        if (!MmkvManager.decodeStartOnBoot() || MmkvManager.getSelectServer().isNullOrEmpty()) return
-        //Start v2ray
-        V2RayServiceManager.startV2Ray(context)
-    }
-}
@@ -1,85 +0,0 @@
-package com.v2ray.ang.receiver
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.widget.RemoteViews
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.Utils
-
-class WidgetProvider : AppWidgetProvider() {
-    /**
-     * 每次窗口小部件被更新都调用一次该方法
-     */
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-        updateWidgetBackground(context, appWidgetManager, appWidgetIds, V2RayServiceManager.v2rayPoint.isRunning)
-    }
-
-
-    private fun updateWidgetBackground(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray, isRunning: Boolean) {
-        val remoteViews = RemoteViews(context.packageName, R.layout.widget_switch)
-        val intent = Intent(context, WidgetProvider::class.java)
-        intent.action = AppConfig.BROADCAST_ACTION_WIDGET_CLICK
-        val pendingIntent = PendingIntent.getBroadcast(
-            context,
-            R.id.layout_switch,
-            intent,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                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)
-            remoteViews.setInt(R.id.layout_background, "setBackgroundResource", R.drawable.ic_rounded_corner_active)
-        } else {
-            remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_play_24dp)
-            remoteViews.setInt(R.id.layout_background, "setBackgroundResource", R.drawable.ic_rounded_corner_inactive)
-        }
-
-        for (appWidgetId in appWidgetIds) {
-            appWidgetManager.updateAppWidget(appWidgetId, remoteViews)
-        }
-    }
-
-    /**
-     * 接收窗口小部件发送的广播
-     */
-    override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        if (AppConfig.BROADCAST_ACTION_WIDGET_CLICK == intent.action) {
-            if (V2RayServiceManager.v2rayPoint.isRunning) {
-                Utils.stopVService(context)
-            } else {
-                Utils.startVServiceFromToggle(context)
-            }
-        } else if (AppConfig.BROADCAST_ACTION_ACTIVITY == intent.action) {
-            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)),
-                            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)),
-                            false
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,44 +0,0 @@
-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 var process: Process? = null
-
-    fun runProcess(context: Context, cmd: MutableList<String>) {
-        Log.d(ANG_PACKAGE, 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(ANG_PACKAGE, "runProcess check")
-                process?.waitFor()
-                Log.d(ANG_PACKAGE, "runProcess exited")
-            }
-            Log.d(ANG_PACKAGE, process.toString())
-
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-    }
-
-    fun stopProcess() {
-        try {
-            Log.d(ANG_PACKAGE, "runProcess destroy")
-            process?.destroy()
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-    }
-}
@@ -1,13 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Service
-
-interface ServiceControl {
-    fun getService(): Service
-
-    fun startService()
-
-    fun stopService()
-
-    fun vpnProtect(socket: Int): Boolean
-}
@@ -1,67 +0,0 @@
-package com.v2ray.ang.service
-
-import android.annotation.SuppressLint
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.content.Context
-import android.os.Build
-import android.util.Log
-import androidx.core.app.NotificationCompat
-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.handler.AngConfigManager.updateConfigViaSub
-import com.v2ray.ang.handler.MmkvManager
-
-object SubscriptionUpdater {
-
-
-    class UpdateTask(context: Context, params: WorkerParameters) :
-        CoroutineWorker(context, params) {
-
-        private val notificationManager = NotificationManagerCompat.from(applicationContext)
-        private val notification =
-            NotificationCompat.Builder(applicationContext, SUBSCRIPTION_UPDATE_CHANNEL)
-                .setWhen(0)
-                .setTicker("Update")
-                .setContentTitle(context.getString(R.string.title_pref_auto_update_subscription))
-                .setSmallIcon(R.drawable.ic_stat_name)
-                .setCategory(NotificationCompat.CATEGORY_SERVICE)
-                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-
-        @SuppressLint("MissingPermission")
-        override suspend fun doWork(): Result {
-            Log.d(AppConfig.ANG_PACKAGE, "subscription automatic update starting")
-
-            val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
-
-            for (sub in subs) {
-                val subItem = sub.second
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    notification.setChannelId(SUBSCRIPTION_UPDATE_CHANNEL)
-                    val channel =
-                        NotificationChannel(
-                            SUBSCRIPTION_UPDATE_CHANNEL,
-                            SUBSCRIPTION_UPDATE_CHANNEL_NAME,
-                            NotificationManager.IMPORTANCE_MIN
-                        )
-                    notificationManager.createNotificationChannel(channel)
-                }
-                notificationManager.notify(3, notification.build())
-                Log.d(
-                    AppConfig.ANG_PACKAGE,
-                    "subscription automatic update: ---${subItem.remarks}"
-                )
-                updateConfigViaSub(Pair(sub.first, subItem))
-                notification.setContentText("Updating ${subItem.remarks}")
-            }
-            notificationManager.cancel(3)
-            return Result.success()
-        }
-    }
-}
@@ -1,56 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.os.IBinder
-import androidx.annotation.RequiresApi
-import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.Utils
-import java.lang.ref.SoftReference
-
-class V2RayProxyOnlyService : Service(), ServiceControl {
-    override fun onCreate() {
-        super.onCreate()
-        V2RayServiceManager.serviceControl = SoftReference(this)
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startV2rayPoint()
-        return START_STICKY
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        V2RayServiceManager.stopV2rayPoint()
-    }
-
-    override fun getService(): Service {
-        return this
-    }
-
-    override fun startService() {
-        // do nothing
-    }
-
-    override fun stopService() {
-        stopSelf()
-    }
-
-    override fun vpnProtect(socket: Int): Boolean {
-        return true
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        return null
-    }
-
-    @RequiresApi(Build.VERSION_CODES.N)
-    override fun attachBaseContext(newBase: Context?) {
-        val context = newBase?.let {
-            MyContextWrapper.wrap(newBase, Utils.getLocale())
-        }
-        super.attachBaseContext(context)
-    }
-}
@@ -1,441 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.graphics.Color
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-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.ProfileItem
-import com.v2ray.ang.extension.toSpeedString
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.V2rayConfigManager
-import com.v2ray.ang.ui.MainActivity
-import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
-import com.v2ray.ang.util.Utils
-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.launch
-import libv2ray.Libv2ray
-import libv2ray.V2RayPoint
-import libv2ray.V2RayVPNServiceSupportsSet
-import java.lang.ref.SoftReference
-import kotlin.math.min
-
-object V2RayServiceManager {
-    private const val NOTIFICATION_ID = 1
-    private const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
-    private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
-    private const val NOTIFICATION_ICON_THRESHOLD = 3000
-
-    val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
-    private val mMsgReceive = ReceiveMessageHandler()
-
-    var serviceControl: SoftReference<ServiceControl>? = null
-        set(value) {
-            field = value
-            Seq.setContext(value?.get()?.getService()?.applicationContext)
-            Libv2ray.initV2Env(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
-        }
-    var currentConfig: ProfileItem? = null
-
-    private var lastQueryTime = 0L
-    private var mBuilder: NotificationCompat.Builder? = null
-    private var mDisposable: Disposable? = null
-    private var mNotificationManager: NotificationManager? = null
-
-    fun startV2Ray(context: Context) {
-        if (v2rayPoint.isRunning) return
-        val guid = MmkvManager.getSelectServer() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
-        if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) return
-//        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
-//        if (!result.status) return
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) == true) {
-            context.toast(R.string.toast_warning_pref_proxysharing_short)
-        } else {
-            context.toast(R.string.toast_services_start)
-        }
-        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
-            Intent(context.applicationContext, V2RayVpnService::class.java)
-        } else {
-            Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
-        }
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
-            context.startForegroundService(intent)
-        } else {
-            context.startService(intent)
-        }
-    }
-
-    private class V2RayCallback : V2RayVPNServiceSupportsSet {
-        override fun shutdown(): Long {
-            val serviceControl = serviceControl?.get() ?: return -1
-            // called by go
-            return try {
-                serviceControl.stopService()
-                0
-            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
-                -1
-            }
-        }
-
-        override fun prepare(): Long {
-            return 0
-        }
-
-        override fun protect(l: Long): Boolean {
-            val serviceControl = serviceControl?.get() ?: return true
-            return serviceControl.vpnProtect(l.toInt())
-        }
-
-        override fun onEmitStatus(l: Long, s: String?): Long {
-            return 0
-        }
-
-        override fun setup(s: String): Long {
-            val serviceControl = serviceControl?.get() ?: return -1
-            return try {
-                serviceControl.startService()
-                lastQueryTime = System.currentTimeMillis()
-                startSpeedNotification()
-                0
-            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
-                -1
-            }
-        }
-    }
-
-    /**
-     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
-     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
-     */
-
-    fun startV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
-        val guid = MmkvManager.getSelectServer() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
-        if (v2rayPoint.isRunning) {
-            return
-        }
-        val result = V2rayConfigManager.getV2rayConfig(service, guid)
-        if (!result.status)
-            return
-
-        try {
-            val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
-            mFilter.addAction(Intent.ACTION_SCREEN_ON)
-            mFilter.addAction(Intent.ACTION_SCREEN_OFF)
-            mFilter.addAction(Intent.ACTION_USER_PRESENT)
-            ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-
-        v2rayPoint.configureFileContent = result.content
-        v2rayPoint.domainName = result.domainPort
-        currentConfig = config
-
-        try {
-            v2rayPoint.runLoop(MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-
-        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()
-        }
-    }
-
-    fun stopV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
-
-        if (v2rayPoint.isRunning) {
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    v2rayPoint.stopLoop()
-                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, e.toString())
-                }
-            }
-        }
-
-        MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_STOP_SUCCESS, "")
-        cancelNotification()
-
-        try {
-            service.unregisterReceiver(mMsgReceive)
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-        PluginUtil.stopPlugin()
-    }
-
-    private class ReceiveMessageHandler : BroadcastReceiver() {
-        override fun onReceive(ctx: Context?, intent: Intent?) {
-            val serviceControl = serviceControl?.get() ?: return
-            when (intent?.getIntExtra("key", 0)) {
-                AppConfig.MSG_REGISTER_CLIENT -> {
-                    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()
-                }
-            }
-
-            when (intent?.action) {
-                Intent.ACTION_SCREEN_OFF -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
-                    stopSpeedNotification()
-                }
-
-                Intent.ACTION_SCREEN_ON -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
-                    startSpeedNotification()
-                }
-            }
-        }
-    }
-
-    private fun measureV2rayDelay() {
-        CoroutineScope(Dispatchers.IO).launch {
-            val service = serviceControl?.get()?.getService() ?: return@launch
-            var time = -1L
-            var errstr = ""
-            if (v2rayPoint.isRunning) {
-                try {
-                    time = v2rayPoint.measureDelay(Utils.getDelayTestUrl())
-                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                    errstr = e.message?.substringAfter("\":") ?: "empty message"
-                }
-                if (time == -1L) {
-                    try {
-                        time = v2rayPoint.measureDelay(Utils.getDelayTestUrl(true))
-                    } catch (e: Exception) {
-                        Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                        errstr = e.message?.substringAfter("\":") ?: "empty message"
-                    }
-                }
-            }
-            val result = if (time == -1L) {
-                service.getString(R.string.connection_test_error, errstr)
-            } else {
-                service.getString(R.string.connection_test_available, time)
-            }
-
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
-        }
-    }
-
-    private fun showNotification() {
-        val service = serviceControl?.get()?.getService() ?: return
-        val startMainIntent = Intent(service, MainActivity::class.java)
-        val contentPendingIntent = PendingIntent.getActivity(
-            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,
-            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) {
-                createNotificationChannel()
-            } else {
-                // 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)
-                ""
-            }
-
-        mBuilder = NotificationCompat.Builder(service, channelId)
-            .setSmallIcon(R.drawable.ic_stat_name)
-            .setContentTitle(currentConfig?.remarks)
-            .setPriority(NotificationCompat.PRIORITY_MIN)
-            .setOngoing(true)
-            .setShowWhen(false)
-            .setOnlyAlertOnce(true)
-            .setContentIntent(contentPendingIntent)
-            .addAction(
-                R.drawable.ic_delete_24dp,
-                service.getString(R.string.notification_action_stop_v2ray),
-                stopV2RayPendingIntent
-            )
-        //.build()
-
-        //mBuilder?.setDefaults(NotificationCompat.FLAG_ONLY_ALERT_ONCE)  //取消震动,铃声其他都不好使
-
-        service.startForeground(NOTIFICATION_ID, mBuilder?.build())
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun createNotificationChannel(): String {
-        val channelId = AppConfig.RAY_NG_CHANNEL_ID
-        val channelName = AppConfig.RAY_NG_CHANNEL_NAME
-        val chan = NotificationChannel(
-            channelId,
-            channelName, NotificationManager.IMPORTANCE_HIGH
-        )
-        chan.lightColor = Color.DKGRAY
-        chan.importance = NotificationManager.IMPORTANCE_NONE
-        chan.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
-        getNotificationManager()?.createNotificationChannel(chan)
-        return channelId
-    }
-
-    fun cancelNotification() {
-        val service = serviceControl?.get()?.getService() ?: return
-        service.stopForeground(true)
-        mBuilder = null
-        mDisposable?.dispose()
-        mDisposable = null
-    }
-
-    private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) {
-        if (mBuilder != null) {
-            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_name)
-            } else if (proxyTraffic > directTraffic) {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
-            } else {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
-            }
-            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
-            mBuilder?.setContentText(contentText) // Emui4.1 need content text even if style is set as BigTextStyle
-            getNotificationManager()?.notify(NOTIFICATION_ID, mBuilder?.build())
-        }
-    }
-
-    private fun getNotificationManager(): NotificationManager? {
-        if (mNotificationManager == null) {
-            val service = serviceControl?.get()?.getService() ?: return null
-            mNotificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        }
-        return mNotificationManager
-    }
-
-    private fun startSpeedNotification() {
-        if (mDisposable == null &&
-            v2rayPoint.isRunning &&
-            MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) == true
-        ) {
-            var lastZeroSpeed = false
-            val outboundTags = currentConfig?.getAllOutboundTags()
-            outboundTags?.remove(TAG_DIRECT)
-
-            mDisposable = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
-                .subscribe {
-                    val queryTime = System.currentTimeMillis()
-                    val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
-                    var proxyTotal = 0L
-                    val text = StringBuilder()
-                    outboundTags?.forEach {
-                        val up = v2rayPoint.queryStats(it, AppConfig.UPLINK)
-                        val down = v2rayPoint.queryStats(it, AppConfig.DOWNLINK)
-                        if (up + down > 0) {
-                            appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
-                            proxyTotal += up + down
-                        }
-                    }
-                    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
-                }
-        }
-    }
-
-    private fun appendSpeedString(text: StringBuilder, name: String?, up: Double, down: Double) {
-        var n = name ?: "no tag"
-        n = n.substring(0, min(n.length, 6))
-        text.append(n)
-        for (i in n.length..6 step 2) {
-            text.append("\t")
-        }
-        text.append("•  ${up.toLong().toSpeedString()}↑  ${down.toLong().toSpeedString()}↓\n")
-    }
-
-    private fun stopSpeedNotification() {
-        mDisposable?.let {
-            it.dispose() //stop queryStats
-            mDisposable = null
-            updateNotification(currentConfig?.remarks, 0, 0)
-        }
-    }
-
-}
@@ -1,71 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Service
-import android.content.Intent
-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.handler.MmkvManager
-import com.v2ray.ang.handler.V2rayConfigManager
-import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
-import com.v2ray.ang.util.SpeedtestUtil
-import com.v2ray.ang.util.Utils
-import go.Seq
-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
-
-class V2RayTestService : Service() {
-    private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()).asCoroutineDispatcher()) }
-
-    override fun onCreate() {
-        super.onCreate()
-        Seq.setContext(this)
-        Libv2ray.initV2Env(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        when (intent?.getIntExtra("key", 0)) {
-            MSG_MEASURE_CONFIG -> {
-                val guid = intent.serializable<String>("content") ?: ""
-                realTestScope.launch {
-                    val result = startRealPing(guid)
-                    MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
-                }
-            }
-
-            MSG_MEASURE_CONFIG_CANCEL -> {
-                realTestScope.coroutineContext[Job]?.cancelChildren()
-            }
-        }
-        return super.onStartCommand(intent, flags, startId)
-    }
-
-    override fun onBind(intent: Intent?): IBinder? {
-        return null
-    }
-
-    private fun startRealPing(guid: String): Long {
-        val retFailure = -1L
-
-        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
-        if (config.configType == EConfigType.HYSTERIA2) {
-            val delay = PluginUtil.realPingHy2(this, config)
-            return delay
-        } else {
-            val config = V2rayConfigManager.getV2rayConfig(this, guid)
-            if (!config.status) {
-                return retFailure
-            }
-            return SpeedtestUtil.realPing(config.content)
-        }
-    }
-}
@@ -1,350 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-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.ProxyInfo
-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.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.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-import java.lang.ref.SoftReference
-
-class V2RayVpnService : VpnService(), ServiceControl {
-    companion object {
-        private const val VPN_MTU = 1500
-        private const val PRIVATE_VLAN4_CLIENT = "26.26.26.1"
-        private const val PRIVATE_VLAN4_ROUTER = "26.26.26.2"
-        private const val PRIVATE_VLAN6_CLIENT = "da26:2626::1"
-        private const val PRIVATE_VLAN6_ROUTER = "da26:2626::2"
-        private const val TUN2SOCKS = "libtun2socks.so"
-    }
-
-
-    private lateinit var mInterface: ParcelFileDescriptor
-    private var isRunning = false
-
-    //val fd: Int get() = mInterface.fd
-    private lateinit var process: Process
-
-    /**destroy
-     * Unfortunately registerDefaultNetworkCallback is going to return our VPN interface: https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
-     *
-     * This makes doing a requestNetwork with REQUEST necessary so that we don't get ALL possible networks that
-     * satisfies default network capabilities but only THE default network. Unfortunately we need to have
-     * android.permission.CHANGE_NETWORK_STATE to be able to call requestNetwork.
-     *
-     * Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
-     */
-    @delegate:RequiresApi(Build.VERSION_CODES.P)
-    private val defaultNetworkRequest by lazy {
-        NetworkRequest.Builder()
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
-            .build()
-    }
-
-    private val connectivity by lazy { getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager }
-
-    @delegate:RequiresApi(Build.VERSION_CODES.P)
-    private val defaultNetworkCallback by lazy {
-        object : ConnectivityManager.NetworkCallback() {
-            override fun onAvailable(network: Network) {
-                setUnderlyingNetworks(arrayOf(network))
-            }
-
-            override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-                // it's a good idea to refresh capabilities
-                setUnderlyingNetworks(arrayOf(network))
-            }
-
-            override fun onLost(network: Network) {
-                setUnderlyingNetworks(null)
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
-        StrictMode.setThreadPolicy(policy)
-        V2RayServiceManager.serviceControl = SoftReference(this)
-    }
-
-    override fun onRevoke() {
-        stopV2Ray()
-    }
-
-//    override fun onLowMemory() {
-//        stopV2Ray()
-//        super.onLowMemory()
-//    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        V2RayServiceManager.cancelNotification()
-    }
-
-    private fun setup() {
-        val prepare = prepare(this)
-        if (prepare != null) {
-            return
-        }
-
-        // If the old interface has exactly the same parameters, use it!
-        // Configure a builder while parsing the parameters.
-        val builder = Builder()
-        //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
-
-        builder.setMtu(VPN_MTU)
-        builder.addAddress(PRIVATE_VLAN4_CLIENT, 30)
-        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        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())
-            }
-        } else {
-            builder.addRoute("0.0.0.0", 0)
-        }
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
-            builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
-            if (bypassLan) {
-                builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
-            } else {
-                builder.addRoute("::", 0)
-            }
-        }
-
-//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-//        } else {
-        Utils.getVpnDnsServers()
-            .forEach {
-                if (Utils.isPureIpAddress(it)) {
-                    builder.addDnsServer(it)
-                }
-            }
-//        }
-
-        builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
-
-        val selfPackageName = BuildConfig.APPLICATION_ID
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
-            val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-            val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
-            //process self package
-            if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
-            apps?.forEach {
-                try {
-                    if (bypassApps)
-                        builder.addDisallowedApplication(it)
-                    else
-                        builder.addAllowedApplication(it)
-                } catch (e: PackageManager.NameNotFoundException) {
-                    Log.d(ANG_PACKAGE, "setup error : --${e.localizedMessage}")
-                }
-            }
-        } else {
-            builder.addDisallowedApplication(selfPackageName)
-        }
-
-        // Close the old interface since the parameters have been changed.
-        try {
-            mInterface.close()
-        } catch (ignored: Exception) {
-            // ignored
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            try {
-                connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            builder.setMetered(false)
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
-                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
-            }
-        }
-
-        // Create a new interface using the builder and save the parameters.
-        try {
-            mInterface = builder.establish()!!
-            isRunning = true
-            runTun2socks()
-        } catch (e: Exception) {
-            // non-nullable lateinit var
-            e.printStackTrace()
-            stopV2Ray()
-        }
-    }
-
-    private fun runTun2socks() {
-        val socksPort = SettingsManager.getSocksPort()
-        val cmd = arrayListOf(
-            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-            "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,
-            "--netif-netmask", "255.255.255.252",
-            "--socks-server-addr", "$LOOPBACK:${socksPort}",
-            "--tunmtu", VPN_MTU.toString(),
-            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
-            "--enable-udprelay",
-            "--loglevel", "notice"
-        )
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
-            cmd.add("--netif-ip6addr")
-            cmd.add(PRIVATE_VLAN6_ROUTER)
-        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
-            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
-            cmd.add("--dnsgw")
-            cmd.add("$LOOPBACK:${localDnsPort}")
-        }
-        Log.d(packageName, cmd.toString())
-
-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(applicationContext.filesDir)
-                .start()
-            Thread {
-                Log.d(packageName, "$TUN2SOCKS check")
-                process.waitFor()
-                Log.d(packageName, "$TUN2SOCKS exited")
-                if (isRunning) {
-                    Log.d(packageName, "$TUN2SOCKS restart")
-                    runTun2socks()
-                }
-            }.start()
-            Log.d(packageName, process.toString())
-
-            sendFd()
-        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
-        }
-    }
-
-    private fun sendFd() {
-        val fd = mInterface.fileDescriptor
-        val path = File(applicationContext.filesDir, "sock_path").absolutePath
-        Log.d(packageName, path)
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var tries = 0
-            while (true) try {
-                Thread.sleep(50L shl tries)
-                Log.d(packageName, "sendFd tries: $tries")
-                LocalSocket().use { localSocket ->
-                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
-                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
-                    localSocket.outputStream.write(42)
-                }
-                break
-            } catch (e: Exception) {
-                Log.d(packageName, e.toString())
-                if (tries > 5) break
-                tries += 1
-            }
-        }
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startV2rayPoint()
-        return START_STICKY
-        //return super.onStartCommand(intent, flags, startId)
-    }
-
-    private fun stopV2Ray(isForced: Boolean = true) {
-//        val configName = defaultDPreference.getPrefString(PREF_CURR_CONFIG_GUID, "")
-//        val emptyInfo = VpnNetworkInfo()
-//        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
-//        saveVpnNetworkInfo(configName, info)
-        isRunning = false
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            try {
-                connectivity.unregisterNetworkCallback(defaultNetworkCallback)
-            } catch (ignored: Exception) {
-                // ignored
-            }
-        }
-
-        try {
-            Log.d(packageName, "tun2socks destroy")
-            process.destroy()
-        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
-        }
-
-        V2RayServiceManager.stopV2rayPoint()
-
-        if (isForced) {
-            //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
-            //It's strage but true.
-            //This can be verified by putting stopself() behind and call stopLoop and startLoop
-            //in a row for several times. You will find that later created v2ray core report port in use
-            //which means the first v2ray core somehow failed to stop and release the port.
-            stopSelf()
-
-            try {
-                mInterface.close()
-            } catch (ignored: Exception) {
-                // ignored
-            }
-        }
-    }
-
-    override fun getService(): Service {
-        return this
-    }
-
-    override fun startService() {
-        setup()
-    }
-
-    override fun stopService() {
-        stopV2Ray(true)
-    }
-
-    override fun vpnProtect(socket: Int): Boolean {
-        return protect(socket)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.N)
-    override fun attachBaseContext(newBase: Context?) {
-        val context = newBase?.let {
-            MyContextWrapper.wrap(newBase, Utils.getLocale())
-        }
-        super.attachBaseContext(context)
-    }
-}
@@ -1,179 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.FileProvider
-import com.tbruyelle.rxpermissions3.RxPermissions
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityAboutBinding
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.SpeedtestUtil
-import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.ZipUtil
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Locale
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-
-
-class AboutActivity : BaseActivity() {
-    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)
-        setContentView(binding.root)
-
-        title = getString(R.string.title_about)
-
-        binding.tvBackupSummary.text = this.getString(R.string.summary_configuration_backup, extDir)
-        binding.layoutBackup.setOnClickListener {
-            val ret = backupConfiguration(extDir.absolutePath)
-            if (ret.first) {
-                toast(R.string.toast_success)
-            } else {
-                toast(R.string.toast_failure)
-            }
-        }
-
-        binding.layoutShare.setOnClickListener {
-            val ret = backupConfiguration(cacheDir.absolutePath)
-            if (ret.first) {
-                startActivity(
-                    Intent.createChooser(
-                        Intent(Intent.ACTION_SEND).setType("application/zip")
-                            .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                            .putExtra(
-                                Intent.EXTRA_STREAM, FileProvider.getUriForFile(
-                                    this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second)
-                                )
-                            ), getString(R.string.title_configuration_share)
-                    )
-                )
-            } else {
-                toast(R.string.toast_failure)
-            }
-        }
-
-        binding.layoutRestore.setOnClickListener {
-            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Manifest.permission.READ_MEDIA_IMAGES
-            } else {
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            }
-            RxPermissions(this)
-                .request(permission)
-                .subscribe {
-                    if (it) {
-                        try {
-                            showFileChooser()
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    } else
-                        toast(R.string.toast_permission_denied)
-                }
-        }
-
-        binding.layoutSoureCcode.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGUrl)
-        }
-
-        binding.layoutFeedback.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGIssues)
-        }
-        binding.layoutOssLicenses.setOnClickListener{
-            startActivity(Intent(this, OssLicensesMenuActivity::class.java))
-        }
-
-        binding.layoutTgChannel.setOnClickListener {
-            Utils.openUri(this, AppConfig.TgChannelUrl)
-        }
-
-        binding.layoutPrivacyPolicy.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGPrivacyPolicy)
-        }
-
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestUtil.getLibVersion()})".also {
-            binding.tvVersion.text = it
-        }
-    }
-
-    fun backupConfiguration(outputZipFilePos: String): Pair<Boolean, String> {
-        val dateFormated = SimpleDateFormat(
-            "yyyy-MM-dd-HH-mm-ss",
-            Locale.getDefault()
-        ).format(System.currentTimeMillis())
-        val folderName = "${getString(R.string.app_name)}_${dateFormated}"
-        val backupDir = this.cacheDir.absolutePath + "/$folderName"
-        val outputZipFilePath = "$outputZipFilePos/$folderName.zip"
-
-        val count = MMKV.backupAllToDirectory(backupDir)
-        if (count <= 0) {
-            return Pair(false, "")
-        }
-
-        if (ZipUtil.zipFromFolder(backupDir, outputZipFilePath)) {
-            return Pair(true, outputZipFilePath)
-        } else {
-            return Pair(false, "")
-        }
-    }
-
-    fun restoreConfiguration(zipFile: File): Boolean {
-        val backupDir = this.cacheDir.absolutePath + "/${System.currentTimeMillis()}"
-
-        if (!ZipUtil.unzipToFolder(zipFile, backupDir)) {
-            return false
-        }
-
-        val count = MMKV.restoreAllFromDirectory(backupDir)
-        return count > 0
-    }
-
-    private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-            type = "*/*"
-            addCategory(Intent.CATEGORY_OPENABLE)
-        }
-
-        try {
-            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } catch (ex: android.content.ActivityNotFoundException) {
-            Log.e(AppConfig.ANG_PACKAGE, "File chooser activity not found: ${ex.message}", ex)
-            toast(R.string.toast_require_file_manager)
-        }
-    }
-
-    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            val uri = it.data?.data
-            if (it.resultCode == RESULT_OK && uri != null) {
-                try {
-                    val targetFile =
-                        File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
-                    contentResolver.openInputStream(uri).use { input ->
-                        targetFile.outputStream().use { fileOut ->
-                            input?.copyTo(fileOut)
-                        }
-                    }
-                    if (restoreConfiguration(targetFile)) {
-                        toast(R.string.toast_success)
-                    } else {
-                        toast(R.string.toast_failure)
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e)
-                    toast(R.string.toast_failure)
-                }
-            }
-        }
-
-}
@@ -1,39 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
-import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.Utils
-
-abstract class BaseActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        if (!Utils.getDarkModeStatus(this)) {
-            WindowCompat.getInsetsController(window, window.decorView).apply {
-                isAppearanceLightStatusBars = true
-            }
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        android.R.id.home -> {
-            // 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?) {
-        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, Utils.getLocale()))
-    }
-}
@@ -1,17 +0,0 @@
-package com.v2ray.ang.ui
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
-
-class FragmentAdapter(fragmentActivity: FragmentActivity, private val mFragments: List<Fragment>) :
-    FragmentStateAdapter(fragmentActivity) {
-
-    override fun createFragment(position: Int): Fragment {
-        return mFragments[position]
-    }
-
-    override fun getItemCount(): Int {
-        return mFragments.size
-    }
-}
@@ -1,91 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.text.method.ScrollingMovementMethod
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import androidx.lifecycle.lifecycleScope
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.R
-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.launch
-import kotlinx.coroutines.withContext
-import java.io.IOException
-
-class LogcatActivity : BaseActivity() {
-    private val binding by lazy {
-        ActivityLogcatBinding.inflate(layoutInflater)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.title_logcat)
-
-        logcat(false)
-    }
-
-    private fun logcat(shouldFlushLog: Boolean) {
-        binding.pbWaiting.visibility = View.VISIBLE
-
-        lifecycleScope.launch(Dispatchers.Default) {
-            try {
-                if (shouldFlushLog) {
-                    val lst = linkedSetOf("logcat", "-c")
-                    withContext(Dispatchers.IO) {
-                        val process = Runtime.getRuntime().exec(lst.toTypedArray())
-                        process.waitFor()
-                    }
-                }
-                val lst = linkedSetOf(
-                    "logcat", "-d", "-v", "time", "-s",
-                    "GoLog,tun2socks,$ANG_PACKAGE,AndroidRuntime,System.err"
-                )
-                val process = withContext(Dispatchers.IO) {
-                    Runtime.getRuntime().exec(lst.toTypedArray())
-                }
-                val allText = process.inputStream.bufferedReader().use { it.readText() }
-                withContext(Dispatchers.Main) {
-                    binding.tvLogcat.text = allText
-                    binding.tvLogcat.movementMethod = ScrollingMovementMethod()
-                    binding.pbWaiting.visibility = View.GONE
-                    Handler(Looper.getMainLooper()).post { binding.svLogcat.fullScroll(View.FOCUS_DOWN) }
-                }
-            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    binding.pbWaiting.visibility = View.GONE
-                    toast(R.string.toast_failure)
-                }
-                e.printStackTrace()
-            }
-        }
-    }
-
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_logcat, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.copy_all -> {
-            Utils.setClipboard(this, binding.tvLogcat.text.toString())
-            toast(R.string.toast_success)
-            true
-        }
-
-        R.id.clear_all -> {
-            logcat(true)
-            true
-        }
-
-        else -> super.onOptionsItemSelected(item)
-    }
-}
@@ -1,764 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.net.Uri
-import android.net.VpnService
-import android.os.Build
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
-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.google.android.material.tabs.TabLayout
-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.dto.EConfigType
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.AngConfigManager
-import com.v2ray.ang.handler.MigrateManager
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
-import com.v2ray.ang.service.V2RayServiceManager
-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 kotlinx.coroutines.withContext
-import me.drakeet.support.toast.ToastCompat
-import java.util.concurrent.TimeUnit
-
-class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
-    private val binding by lazy {
-        ActivityMainBinding.inflate(layoutInflater)
-    }
-
-    private val adapter by lazy { MainRecyclerAdapter(this) }
-    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)
-        setContentView(binding.root)
-        title = getString(R.string.title_server)
-        setSupportActionBar(binding.toolbar)
-
-        binding.fab.setOnClickListener {
-            if (mainViewModel.isRunning.value == true) {
-                Utils.stopVService(this)
-            } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
-                val intent = VpnService.prepare(this)
-                if (intent == null) {
-                    startV2Ray()
-                } else {
-                    requestVpnPermission.launch(intent)
-                }
-            } else {
-                startV2Ray()
-            }
-        }
-        binding.layoutTest.setOnClickListener {
-            if (mainViewModel.isRunning.value == true) {
-                setTestState(getString(R.string.connection_test_testing))
-                mainViewModel.testCurrentServerRealPing()
-            } else {
-//                tv_test_state.text = getString(R.string.connection_test_fail)
-            }
-        }
-
-        binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        binding.recyclerView.adapter = adapter
-
-        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
-        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
-
-        val toggle = ActionBarDrawerToggle(
-            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()
-        migrateLegacy()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            RxPermissions(this)
-                .request(Manifest.permission.POST_NOTIFICATIONS)
-                .subscribe {
-                    if (!it)
-                        toast(R.string.toast_permission_denied_notification)
-                }
-        }
-
-        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
-                    binding.drawerLayout.closeDrawer(GravityCompat.START)
-                } else {
-                    //super.onBackPressed()
-                    onBackPressedDispatcher.onBackPressed()
-                }
-            }
-        })
-    }
-
-    private fun setupViewModel() {
-        mainViewModel.updateListAction.observe(this) { index ->
-            if (index >= 0) {
-                adapter.notifyItemChanged(index)
-            } else {
-                adapter.notifyDataSetChanged()
-            }
-        }
-        mainViewModel.updateTestResultAction.observe(this) { setTestState(it) }
-        mainViewModel.isRunning.observe(this) { isRunning ->
-            adapter.isRunning = isRunning
-            if (isRunning) {
-                binding.fab.setImageResource(R.drawable.ic_stop_24dp)
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_active))
-                setTestState(getString(R.string.connection_connected))
-                binding.layoutTest.isFocusable = true
-            } else {
-                binding.fab.setImageResource(R.drawable.ic_play_24dp)
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
-                setTestState(getString(R.string.connection_not_connected))
-                binding.layoutTest.isFocusable = false
-            }
-        }
-        mainViewModel.startListenBroadcast()
-        mainViewModel.initAssets(assets)
-    }
-
-    private fun migrateLegacy() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val result = MigrateManager.migrateServerConfig2Profile()
-            launch(Dispatchers.Main) {
-                if (result) {
-                    toast(getString(R.string.migration_success))
-                    mainViewModel.reloadServerList()
-                } else {
-                    //toast(getString(R.string.migration_fail))
-                }
-            }
-
-        }
-    }
-
-    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 (MmkvManager.getSelectServer().isNullOrEmpty()) {
-            toast(R.string.title_file_chooser)
-            return
-        }
-        V2RayServiceManager.startV2Ray(this)
-    }
-
-    fun restartV2Ray() {
-        if (mainViewModel.isRunning.value == true) {
-            Utils.stopVService(this)
-        }
-        Observable.timer(500, TimeUnit.MILLISECONDS)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                startV2Ray()
-            }
-    }
-
-    public override fun onResume() {
-        super.onResume()
-        mainViewModel.reloadServerList()
-    }
-
-    public override fun onPause() {
-        super.onPause()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
-
-        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) {
-        R.id.import_qrcode -> {
-            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
-        }
-
-        R.id.sub_update -> {
-            importConfigViaSub()
-            true
-        }
-
-        R.id.export_all -> {
-            binding.pbWaiting.show()
-            lifecycleScope.launch(Dispatchers.IO) {
-                val ret = mainViewModel.exportAllServer()
-                launch(Dispatchers.Main) {
-                    if (ret == 0)
-                        toast(R.string.toast_success)
-                    else
-                        toast(R.string.toast_failure)
-                    binding.pbWaiting.hide()
-                }
-            }
-
-            true
-        }
-
-        R.id.ping_all -> {
-            toast(R.string.connection_test_testing)
-            mainViewModel.testAllTcping()
-            true
-        }
-
-        R.id.real_ping_all -> {
-            toast(R.string.connection_test_testing)
-            mainViewModel.testAllRealPing()
-            true
-        }
-
-        R.id.service_restart -> {
-            restartV2Ray()
-            true
-        }
-
-        R.id.del_all_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    binding.pbWaiting.show()
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeAllServer()
-                        launch(Dispatchers.Main) {
-                            mainViewModel.reloadServerList()
-                            binding.pbWaiting.hide()
-                        }
-                    }
-                }
-                .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_invalid_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    binding.pbWaiting.show()
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeInvalidServer()
-                        launch(Dispatchers.Main) {
-                            mainViewModel.reloadServerList()
-                            binding.pbWaiting.hide()
-                        }
-                    }
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
-                }
-                .show()
-            true
-        }
-
-        R.id.sort_by_test_results -> {
-            binding.pbWaiting.show()
-            lifecycleScope.launch(Dispatchers.IO) {
-                mainViewModel.sortByTestResults()
-                launch(Dispatchers.Main) {
-                    mainViewModel.reloadServerList()
-                    binding.pbWaiting.hide()
-                }
-            }
-            true
-        }
-
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    private fun importManually(createConfigType: Int) {
-        startActivity(
-            Intent()
-                .putExtra("createConfigType", createConfigType)
-                .putExtra("subscriptionId", mainViewModel.subscriptionId)
-                .setClass(this, ServerActivity::class.java)
-        )
-    }
-
-    /**
-     * import config from qrcode
-     */
-    private fun importQRcode(forConfig: 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(this)
-            .request(Manifest.permission.CAMERA)
-            .subscribe {
-                if (it)
-                    if (forConfig)
-                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-                    else
-                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
-                else
-                    toast(R.string.toast_permission_denied)
-            }
-//        }
-        return true
-    }
-
-    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
-    private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
-    /**
-     * import config from clipboard
-     */
-    private fun importClipboard()
-            : Boolean {
-        try {
-            val clipboard = Utils.getClipboard(this)
-            importBatchConfig(clipboard)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun importBatchConfig(server: String?) {
-        binding.pbWaiting.show()
-
-        lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val (count, countSub) = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
-                delay(500L)
-                withContext(Dispatchers.Main) {
-                    when {
-                        count > 0 -> {
-                            toast(R.string.toast_success)
-                            mainViewModel.reloadServerList()
-                        }
-
-                        countSub > 0 -> initGroupTab()
-                        else -> toast(R.string.toast_failure)
-                    }
-                    binding.pbWaiting.hide()
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    toast(R.string.toast_failure)
-                    binding.pbWaiting.hide()
-                }
-                e.printStackTrace()
-            }
-        }
-    }
-
-
-    private fun importConfigCustomClipboard()
-            : Boolean {
-        try {
-            val configText = Utils.getClipboard(this)
-            if (TextUtils.isEmpty(configText)) {
-                toast(R.string.toast_none_data_clipboard)
-                return false
-            }
-            importCustomizeConfig(configText)
-            return true
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    /**
-     * import config from local config file
-     */
-    private fun importConfigCustomLocal(): Boolean {
-        try {
-            showFileChooser()
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun importConfigCustomUrlClipboard()
-            : Boolean {
-        try {
-            val url = Utils.getClipboard(this)
-            if (TextUtils.isEmpty(url)) {
-                toast(R.string.toast_none_data_clipboard)
-                return false
-            }
-            return importConfigCustomUrl(url)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    /**
-     * import config from url
-     */
-    private fun importConfigCustomUrl(url: String?): Boolean {
-        try {
-            if (!Utils.isValidUrl(url)) {
-                toast(R.string.toast_invalid_url)
-                return false
-            }
-            lifecycleScope.launch(Dispatchers.IO) {
-                val configText = try {
-                    Utils.getUrlContentWithCustomUserAgent(url)
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    ""
-                }
-                launch(Dispatchers.Main) {
-                    importCustomizeConfig(configText)
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    /**
-     * import config from sub
-     */
-    private fun importConfigViaSub(): Boolean {
-//        val dialog = AlertDialog.Builder(this)
-//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-//            .setCancelable(false)
-//            .show()
-        binding.pbWaiting.show()
-
-        lifecycleScope.launch(Dispatchers.IO) {
-            val count = mainViewModel.updateConfigViaSubAll()
-            delay(500L)
-            launch(Dispatchers.Main) {
-                if (count > 0) {
-                    toast(R.string.toast_success)
-                    mainViewModel.reloadServerList()
-                } else {
-                    toast(R.string.toast_failure)
-                }
-                //dialog.dismiss()
-                binding.pbWaiting.hide()
-            }
-        }
-        return true
-    }
-
-    /**
-     * show file chooser
-     */
-    private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "*/*"
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-        try {
-            chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } catch (ex: ActivityNotFoundException) {
-            toast(R.string.toast_require_file_manager)
-        }
-    }
-
-    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            readContentFromUri(uri)
-        }
-    }
-
-    /**
-     * read content from uri
-     */
-    private fun readContentFromUri(uri: Uri) {
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Manifest.permission.READ_MEDIA_IMAGES
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-        RxPermissions(this)
-            .request(permission)
-            .subscribe {
-                if (it) {
-                    try {
-                        contentResolver.openInputStream(uri).use { input ->
-                            importCustomizeConfig(input?.bufferedReader()?.readText())
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                } else
-                    toast(R.string.toast_permission_denied)
-            }
-    }
-
-    /**
-     * import customize config
-     */
-    private fun importCustomizeConfig(server: String?) {
-        try {
-            if (server == null || TextUtils.isEmpty(server)) {
-                toast(R.string.toast_none_data)
-                return
-            }
-            if (mainViewModel.appendCustomConfigServer(server)) {
-                mainViewModel.reloadServerList()
-                toast(R.string.toast_success)
-            } else {
-                toast(R.string.toast_failure)
-            }
-            //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
-        } catch (e: Exception) {
-            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
-            e.printStackTrace()
-            return
-        }
-    }
-
-    private fun setTestState(content: String?) {
-        binding.tvTestState.text = content
-    }
-
-//    val mConnection = object : ServiceConnection {
-//        override fun onServiceDisconnected(name: ComponentName?) {
-//        }
-//
-//        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-//            sendMsg(AppConfig.MSG_REGISTER_CLIENT, "")
-//        }
-//    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-        if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_BUTTON_B) {
-            moveTaskToBack(false)
-            return true
-        }
-        return super.onKeyDown(keyCode, event)
-    }
-
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.sub_setting -> {
-                requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
-            }
-
-            R.id.settings -> {
-                startActivity(
-                    Intent(this, SettingsActivity::class.java)
-                        .putExtra("isRunning", mainViewModel.isRunning.value == true)
-                )
-            }
-
-            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 -> {
-                startActivity(Intent(this, AboutActivity::class.java))
-            }
-        }
-        binding.drawerLayout.closeDrawer(GravityCompat.START)
-        return true
-    }
-}
@@ -1,249 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.content.Intent
-import android.graphics.Color
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.AngApplication.Companion.application
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-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.extension.toast
-import com.v2ray.ang.handler.AngConfigManager
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.helper.ItemTouchHelperAdapter
-import com.v2ray.ang.helper.ItemTouchHelperViewHolder
-import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.Utils
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import java.util.concurrent.TimeUnit
-
-class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
-    companion object {
-        private const val VIEW_TYPE_ITEM = 1
-        private const val VIEW_TYPE_FOOTER = 2
-    }
-
-    private var mActivity: MainActivity = activity
-    private val share_method: Array<out String> by lazy {
-        mActivity.resources.getStringArray(R.array.share_method)
-    }
-    var isRunning = false
-
-    override fun getItemCount() = mActivity.mainViewModel.serversCache.size + 1
-
-    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
-        if (holder is MainViewHolder) {
-            val guid = mActivity.mainViewModel.serversCache[position].guid
-            val profile = mActivity.mainViewModel.serversCache[position].profile
-//            //filter
-//            if (mActivity.mainViewModel.subscriptionId.isNotEmpty()
-//                && mActivity.mainViewModel.subscriptionId != config.subscriptionId
-//            ) {
-//                holder.itemMainBinding.cardView.visibility = View.GONE
-//            } else {
-//                holder.itemMainBinding.cardView.visibility = View.VISIBLE
-//            }
-
-            val aff = MmkvManager.decodeServerAffiliationInfo(guid)
-
-            holder.itemMainBinding.tvName.text = profile.remarks
-            holder.itemView.setBackgroundColor(Color.TRANSPARENT)
-            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 == MmkvManager.getSelectServer()) {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorAccent)
-            } else {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
-            }
-            holder.itemMainBinding.tvSubscription.text = MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks ?: ""
-
-            var shareOptions = share_method.asList()
-            when (profile.configType) {
-                EConfigType.CUSTOM -> {
-                    holder.itemMainBinding.tvType.text = mActivity.getString(R.string.server_customize_config)
-                    shareOptions = shareOptions.takeLast(1)
-                }
-
-                else -> {
-                    holder.itemMainBinding.tvType.text = profile.configType.name
-                }
-            }
-
-            // 隐藏主页服务器地址为xxx:xxx:***/xxx.xxx.xxx.***
-            val strState = "${
-                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
-
-            holder.itemMainBinding.layoutShare.setOnClickListener {
-                AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i ->
-                    try {
-                        when (i) {
-                            0 -> {
-                                if (profile.configType == EConfigType.CUSTOM) {
-                                    shareFullContent(guid)
-                                } else {
-                                    val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(mActivity))
-                                    ivBinding.ivQcode.setImageBitmap(AngConfigManager.share2QRCode(guid))
-                                    AlertDialog.Builder(mActivity).setView(ivBinding.root).show()
-                                }
-                            }
-
-                            1 -> {
-                                if (AngConfigManager.share2Clipboard(mActivity, guid) == 0) {
-                                    mActivity.toast(R.string.toast_success)
-                                } else {
-                                    mActivity.toast(R.string.toast_failure)
-                                }
-                            }
-
-                            2 -> shareFullContent(guid)
-                            else -> mActivity.toast("else")
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                }.show()
-            }
-
-            holder.itemMainBinding.layoutEdit.setOnClickListener {
-                val intent = Intent().putExtra("guid", guid)
-                    .putExtra("isRunning", isRunning)
-                    .putExtra("createConfigType", profile.configType.value)
-                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 != MmkvManager.getSelectServer()) {
-                    if (MmkvManager.decodeSettingsBool(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) { _, _ ->
-                                //do noting
-                            }
-                            .show()
-                    } else {
-                        removeServer(guid, position)
-                    }
-                } else {
-                    application.toast(R.string.toast_action_not_allowed)
-                }
-            }
-
-            holder.itemMainBinding.infoContainer.setOnClickListener {
-                val selected = MmkvManager.getSelectServer()
-                if (guid != selected) {
-                    MmkvManager.setSelectServer(guid)
-                    if (!TextUtils.isEmpty(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())
-                            .subscribe {
-                                V2RayServiceManager.startV2Ray(mActivity)
-                            }
-                    }
-                }
-            }
-        }
-        if (holder is FooterViewHolder) {
-            //if (activity?.defaultDPreference?.getPrefBoolean(AppConfig.PREF_INAPP_BUY_IS_PREMIUM, false)) {
-            if (true) {
-                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
-            } else {
-                holder.itemFooterBinding.layoutEdit.setOnClickListener {
-                    Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
-                }
-            }
-        }
-    }
-
-    private fun shareFullContent(guid: String) {
-        if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) {
-            mActivity.toast(R.string.toast_success)
-        } else {
-            mActivity.toast(R.string.toast_failure)
-        }
-    }
-
-    private fun removeServer(guid: String, position: Int) {
-        mActivity.mainViewModel.removeServer(guid)
-        notifyItemRemoved(position)
-        notifyItemRangeChanged(position, mActivity.mainViewModel.serversCache.size)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
-        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))
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position == mActivity.mainViewModel.serversCache.size) {
-            VIEW_TYPE_FOOTER
-        } else {
-            VIEW_TYPE_ITEM
-        }
-    }
-
-    open class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        fun onItemSelected() {
-            itemView.setBackgroundColor(Color.LTGRAY)
-        }
-
-        fun onItemClear() {
-            itemView.setBackgroundColor(0)
-        }
-    }
-
-    class MainViewHolder(val itemMainBinding: ItemRecyclerMainBinding) :
-        BaseViewHolder(itemMainBinding.root), ItemTouchHelperViewHolder
-
-    class FooterViewHolder(val itemFooterBinding: ItemRecyclerFooterBinding) :
-        BaseViewHolder(itemFooterBinding.root)
-
-    override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-        mActivity.mainViewModel.swapServer(fromPosition, toPosition)
-        notifyItemMoved(fromPosition, toPosition)
-        return true
-    }
-
-    override fun onItemMoveCompleted() {
-        // do nothing
-    }
-
-    override fun onItemDismiss(position: Int) {
-    }
-}
@@ -1,345 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import android.text.TextUtils
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.widget.SearchView
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityBypassListBinding
-import com.v2ray.ang.dto.AppInfo
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.v2RayApplication
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.AppManagerUtil
-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 java.text.Collator
-
-class PerAppProxyActivity : BaseActivity() {
-    private val binding by lazy {
-        ActivityBypassListBinding.inflate(layoutInflater)
-    }
-
-    private var adapter: PerAppProxyAdapter? = null
-    private var appsAll: List<AppInfo>? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
-        binding.recyclerView.addItemDecoration(dividerItemDecoration)
-
-        val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-
-        AppManagerUtil.rxLoadNetworkAppList(this)
-            .subscribeOn(Schedulers.io())
-            .map {
-                if (blacklist != null) {
-                    it.forEach { one ->
-                        if (blacklist.contains(one.packageName)) {
-                            one.isSelected = 1
-                        } else {
-                            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)
-                }
-            }
-//                .map {
-//                    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)
-//                }
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                appsAll = it
-                adapter = PerAppProxyAdapter(this, it, blacklist)
-                binding.recyclerView.adapter = adapter
-                binding.pbWaiting.visibility = View.GONE
-            }
-        /***
-        recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-        var dst = 0
-        val threshold = resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 2
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-        dst += dy
-        if (dst > threshold) {
-        header_view.hide()
-        dst = 0
-        } else if (dst < -20) {
-        header_view.show()
-        dst = 0
-        }
-        }
-
-        var hiding = false
-        fun View.hide() {
-        val target = -height.toFloat()
-        if (hiding || translationY == target) return
-        animate()
-        .translationY(target)
-        .setInterpolator(AccelerateInterpolator(2F))
-        .setListener(object : AnimatorListenerAdapter() {
-        override fun onAnimationEnd(animation: Animator?) {
-        hiding = false
-        }
-        })
-        hiding = true
-        }
-
-        var showing = false
-        fun View.show() {
-        val target = 0f
-        if (showing || translationY == target) return
-        animate()
-        .translationY(target)
-        .setInterpolator(DecelerateInterpolator(2F))
-        .setListener(object : AnimatorListenerAdapter() {
-        override fun onAnimationEnd(animation: Animator?) {
-        showing = false
-        }
-        })
-        showing = true
-        }
-        })
-         ***/
-
-        binding.switchPerAppProxy.setOnCheckedChangeListener { _, isChecked ->
-            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY, isChecked)
-        }
-        binding.switchPerAppProxy.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false)
-
-        binding.switchBypassApps.setOnCheckedChangeListener { _, isChecked ->
-            MmkvManager.encodeSettings(AppConfig.PREF_BYPASS_APPS, isChecked)
-        }
-        binding.switchBypassApps.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS, false)
-
-        /***
-        et_search.setOnEditorActionListener { v, actionId, event ->
-        if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-        //hide
-        var imm: InputMethodManager = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.toggleSoftInput(0, InputMethodManager.HIDE_NOT_ALWAYS)
-
-        val key = v.text.toString().toUpperCase()
-        val apps = ArrayList<AppInfo>()
-        if (TextUtils.isEmpty(key)) {
-        appsAll?.forEach {
-        apps.add(it)
-        }
-        } else {
-        appsAll?.forEach {
-        if (it.appName.toUpperCase().indexOf(key) >= 0) {
-        apps.add(it)
-        }
-        }
-        }
-        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
-        recycler_view.adapter = adapter
-        adapter?.notifyDataSetChanged()
-        true
-        } else {
-        false
-        }
-        }
-         ***/
-    }
-
-    override fun onPause() {
-        super.onPause()
-        adapter?.let {
-            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY_SET, it.blacklist)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_bypass_list, menu)
-
-        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 {
-                    filterProxyApp(newText.orEmpty())
-                    return false
-                }
-            })
-        }
-
-
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.select_all -> adapter?.let {
-            val pkgNames = it.apps.map { it.packageName }
-            if (it.blacklist.containsAll(pkgNames)) {
-                it.apps.forEach {
-                    val packageName = it.packageName
-                    adapter?.blacklist?.remove(packageName)
-                }
-            } else {
-                it.apps.forEach {
-                    val packageName = it.packageName
-                    adapter?.blacklist?.add(packageName)
-                }
-            }
-            it.notifyDataSetChanged()
-            true
-        } == true
-
-        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)
-    }
-
-    private fun selectProxyApp() {
-        toast(R.string.msg_downloading_content)
-        val url = AppConfig.androidpackagenamelistUrl
-        lifecycleScope.launch(Dispatchers.IO) {
-            val content = Utils.getUrlContext(url, 5000)
-            launch(Dispatchers.Main) {
-                Log.d(ANG_PACKAGE, content)
-                selectProxyApp(content, true)
-                toast(R.string.toast_success)
-            }
-        }
-    }
-
-    private fun importProxyApp() {
-        val content = Utils.getClipboard(applicationContext)
-        if (TextUtils.isEmpty(content)) return
-        selectProxyApp(content, false)
-        toast(R.string.toast_success)
-    }
-
-    private fun exportProxyApp() {
-        var lst = binding.switchBypassApps.isChecked.toString()
-
-        adapter?.blacklist?.forEach block@{
-            lst = lst + System.getProperty("line.separator") + it
-        }
-        Utils.setClipboard(applicationContext, lst)
-        toast(R.string.toast_success)
-    }
-
-    private fun selectProxyApp(content: String, force: Boolean): Boolean {
-        try {
-            val proxyApps = if (TextUtils.isEmpty(content)) {
-                Utils.readTextFromAssets(v2RayApplication, "proxy_packagename.txt")
-            } else {
-                content
-            }
-            if (TextUtils.isEmpty(proxyApps)) return false
-
-            adapter?.blacklist?.clear()
-
-            if (binding.switchBypassApps.isChecked) {
-                adapter?.let {
-                    it.apps.forEach block@{
-                        val packageName = it.packageName
-                        Log.d(ANG_PACKAGE, packageName)
-                        if (!inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
-                            println(packageName)
-                            return@block
-                        }
-                    }
-                    it.notifyDataSetChanged()
-                }
-            } else {
-                adapter?.let {
-                    it.apps.forEach block@{
-                        val packageName = it.packageName
-                        Log.d(ANG_PACKAGE, packageName)
-                        if (inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
-                            println(packageName)
-                            return@block
-                        }
-                    }
-                    it.notifyDataSetChanged()
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    private fun inProxyApps(proxyApps: String, packageName: String, force: Boolean): Boolean {
-        if (force) {
-            if (packageName == "com.google.android.webview") return false
-            if (packageName.startsWith("com.google")) return true
-        }
-
-        return proxyApps.indexOf(packageName) >= 0
-    }
-
-    private fun filterProxyApp(content: String): Boolean {
-        val apps = ArrayList<AppInfo>()
-
-        val key = content.uppercase()
-        if (key.isNotEmpty()) {
-            appsAll?.forEach {
-                if (it.appName.uppercase().indexOf(key) >= 0
-                    || it.packageName.uppercase().indexOf(key) >= 0
-                ) {
-                    apps.add(it)
-                }
-            }
-        } else {
-            appsAll?.forEach {
-                apps.add(it)
-            }
-        }
-
-        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
-        binding.recyclerView.adapter = adapter
-        adapter?.notifyDataSetChanged()
-        return true
-    }
-}
@@ -1,131 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-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.handler.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 == true
-        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.apply {
-            remarks = binding.etRemarks.text.toString()
-            looked = binding.chkLocked.isChecked
-            domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            protocol = binding.etProtocol.text.toString().takeIf { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            port = binding.etPort.text.toString().takeIf { it.isNotEmpty() }
-            network = binding.etNetwork.text.toString().takeIf { it.isNotEmpty() }
-            outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
-        }
-
-        if (rulesetItem.remarks.isNullOrEmpty()) {
-            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)
-    }
-
-}
@@ -1,205 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-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.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.tbruyelle.rxpermissions3.RxPermissions
-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.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-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, MmkvManager.decodeSettingsString(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) {
-                MmkvManager.encodeSettings(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_predefined_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.resetRoutingRulesetsFromPresets(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) { _, _ ->
-                    val clipboard = try {
-                        Utils.getClipboard(this)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                        toast(R.string.toast_failure)
-                        return@setPositiveButton
-                    }
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        val result = SettingsManager.resetRoutingRulesets(clipboard)
-                        withContext(Dispatchers.Main) {
-                            if (result) {
-                                refreshData()
-                                toast(R.string.toast_success)
-                            } else {
-                                toast(R.string.toast_failure)
-                            }
-                        }
-                    }
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do nothing
-                }
-                .show()
-            true
-        }
-
-        R.id.import_rulesets_from_qrcode -> {
-            RxPermissions(this)
-                .request(Manifest.permission.CAMERA)
-                .subscribe {
-                    if (it)
-                        scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-                    else
-                        toast(R.string.toast_permission_denied)
-                }
-            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)
-    }
-
-    private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importRulesetsFromQRcode(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
-    private fun importRulesetsFromQRcode(qrcode: String?): Boolean {
-        AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val result = SettingsManager.resetRoutingRulesets(qrcode)
-                    withContext(Dispatchers.Main) {
-                        if (result) {
-                            refreshData()
-                            toast(R.string.toast_success)
-                        } else {
-                            toast(R.string.toast_failure)
-                        }
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.no) { _, _ ->
-                //do nothing
-            }
-            .show()
-        return true
-    }
-
-    fun refreshData() {
-        rulesets.clear()
-        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
-        adapter.notifyDataSetChanged()
-    }
-
-}
@@ -1,80 +0,0 @@
-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.handler.SettingsManager
-import com.v2ray.ang.helper.ItemTouchHelperAdapter
-import com.v2ray.ang.helper.ItemTouchHelperViewHolder
-
-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 == true
-        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) {
-    }
-}
@@ -1,50 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-import android.content.Intent
-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.handler.AngConfigManager
-
-class ScScannerActivity : BaseActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_none)
-        importQRcode()
-    }
-
-    fun importQRcode(): Boolean {
-        RxPermissions(this)
-            .request(Manifest.permission.CAMERA)
-            .subscribe { granted ->
-                if (granted) {
-                    scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-                } else {
-                    toast(R.string.toast_permission_denied)
-                }
-            }
-        return true
-    }
-
-
-    private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            val scanResult = it.data?.getStringExtra("SCAN_RESULT").orEmpty()
-            val (count, countSub) = AngConfigManager.importBatchConfig(scanResult, "", false)
-
-            if (count + countSub > 0) {
-                toast(R.string.toast_success)
-            } else {
-                toast(R.string.toast_failure)
-            }
-
-            startActivity(Intent(this, MainActivity::class.java))
-        }
-        finish()
-    }
-
-}
@@ -1,22 +0,0 @@
-package com.v2ray.ang.ui
-
-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?) {
-        super.onCreate(savedInstanceState)
-        moveTaskToBack(true)
-
-        setContentView(R.layout.activity_none)
-
-        if (V2RayServiceManager.v2rayPoint.isRunning) {
-            Utils.stopVService(this)
-        } else {
-            Utils.startVServiceFromToggle(this)
-        }
-        finish()
-    }
-}
@@ -1,125 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-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.rxpermissions3.RxPermissions
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.QRCodeDecoder
-import io.github.g00fy2.quickie.QRResult
-import io.github.g00fy2.quickie.ScanCustomCode
-import io.github.g00fy2.quickie.config.ScannerConfig
-
-class ScannerActivity : BaseActivity() {
-
-    private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
-
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
-            launchScan()
-        }
-    }
-
-    private fun launchScan() {
-        scanQrCode.launch(
-            ScannerConfig.build {
-                setHapticSuccessFeedback(true) // enable (default) or disable haptic feedback when a barcode was detected
-                setShowTorchToggle(true) // show or hide (default) torch/flashlight toggle button
-                setShowCloseButton(true) // show or hide (default) close button
-            }
-        )
-    }
-
-    private fun handleResult(result: QRResult) {
-        if (result is QRResult.QRSuccess) {
-            finished(result.content.rawValue.orEmpty())
-        } else {
-            finish()
-        }
-    }
-
-    private fun finished(text: String) {
-        val intent = Intent()
-        intent.putExtra("SCAN_RESULT", text)
-        setResult(RESULT_OK, intent)
-        finish()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_scanner, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.scan_code -> {
-            launchScan()
-            true
-        }
-
-        R.id.select_photo -> {
-            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Manifest.permission.READ_MEDIA_IMAGES
-            } else {
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            }
-            RxPermissions(this)
-                .request(permission)
-                .subscribe { granted ->
-                    if (granted) {
-                        showFileChooser()
-                    } else {
-                        toast(R.string.toast_permission_denied)
-                    }
-                }
-            true
-        }
-
-
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "image/*"
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
-        //intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-
-        try {
-            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } catch (ex: android.content.ActivityNotFoundException) {
-            toast(R.string.toast_require_file_manager)
-        }
-    }
-
-    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            try {
-                val inputStream = contentResolver.openInputStream(uri)
-                val bitmap = BitmapFactory.decodeStream(inputStream)
-                inputStream?.close()
-
-                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                if (text.isNullOrEmpty()) {
-                    toast(R.string.toast_decoding_failed)
-                } else {
-                    finished(text)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                toast(R.string.toast_decoding_failed)
-            }
-        }
-    }
-
-}
@@ -1,648 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import android.text.TextUtils
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.AppConfig.DEFAULT_PORT
-import com.v2ray.ang.AppConfig.PREF_ALLOW_INSECURE
-import com.v2ray.ang.AppConfig.REALITY
-import com.v2ray.ang.AppConfig.TLS
-import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
-import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
-import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-
-class ServerActivity : BaseActivity() {
-
-    private val editGuid by lazy { intent.getStringExtra("guid").orEmpty() }
-    private val isRunning by lazy {
-        intent.getBooleanExtra("isRunning", false)
-                && editGuid.isNotEmpty()
-                && editGuid == MmkvManager.getSelectServer()
-    }
-    private val createConfigType by lazy {
-        EConfigType.fromInt(intent.getIntExtra("createConfigType", EConfigType.VMESS.value))
-            ?: EConfigType.VMESS
-    }
-    private val subscriptionId by lazy {
-        intent.getStringExtra("subscriptionId")
-    }
-
-    private val securitys: Array<out String> by lazy {
-        resources.getStringArray(R.array.securitys)
-    }
-    private val shadowsocksSecuritys: Array<out String> by lazy {
-        resources.getStringArray(R.array.ss_securitys)
-    }
-    private val flows: Array<out String> by lazy {
-        resources.getStringArray(R.array.flows)
-    }
-    private val networks: Array<out String> by lazy {
-        resources.getStringArray(R.array.networks)
-    }
-    private val tcpTypes: Array<out String> by lazy {
-        resources.getStringArray(R.array.header_type_tcp)
-    }
-    private val kcpAndQuicTypes: Array<out String> by lazy {
-        resources.getStringArray(R.array.header_type_kcp_and_quic)
-    }
-    private val grpcModes: Array<out String> by lazy {
-        resources.getStringArray(R.array.mode_type_grpc)
-    }
-    private val streamSecuritys: Array<out String> by lazy {
-        resources.getStringArray(R.array.streamsecurityxs)
-    }
-    private val allowinsecures: Array<out String> by lazy {
-        resources.getStringArray(R.array.allowinsecures)
-    }
-    private val uTlsItems: Array<out String> by lazy {
-        resources.getStringArray(R.array.streamsecurity_utls)
-    }
-    private val alpns: Array<out String> by lazy {
-        resources.getStringArray(R.array.streamsecurity_alpn)
-    }
-    private val xhttpMode: Array<out String> by lazy {
-        resources.getStringArray(R.array.xhttp_mode)
-    }
-
-
-    // Kotlin synthetics was used, but since it is removed in 1.8. We switch to old manual approach.
-    // We don't use AndroidViewBinding because, it is better to share similar logics for different
-    // protocols. Use findViewById manually ensures the xml are de-coupled with the activity logic.
-    private val et_remarks: EditText by lazy { findViewById(R.id.et_remarks) }
-    private val et_address: EditText by lazy { findViewById(R.id.et_address) }
-    private val et_port: EditText by lazy { findViewById(R.id.et_port) }
-    private val et_id: EditText by lazy { findViewById(R.id.et_id) }
-    private val et_security: EditText? by lazy { findViewById(R.id.et_security) }
-    private val sp_flow: Spinner? by lazy { findViewById(R.id.sp_flow) }
-    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.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.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.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) }
-    private val tv_request_host: TextView? by lazy { findViewById(R.id.tv_request_host) }
-    private val et_request_host: EditText? by lazy { findViewById(R.id.et_request_host) }
-    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.lay_stream_alpn) }
-    private val et_public_key: EditText? by lazy { findViewById(R.id.et_public_key) }
-    private val et_preshared_key: EditText? by lazy { findViewById(R.id.et_preshared_key) }
-    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.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.lay_spider_x) }
-    private val et_reserved1: EditText? by lazy { findViewById(R.id.et_reserved1) }
-    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) }
-    private val et_port_hop: EditText? by lazy { findViewById(R.id.et_port_hop) }
-    private val et_port_hop_interval: EditText? by lazy { findViewById(R.id.et_port_hop_interval) }
-    private val et_pinsha256: EditText? by lazy { findViewById(R.id.et_pinsha256) }
-    private val et_extra: EditText? by lazy { findViewById(R.id.et_extra) }
-    private val layout_extra: LinearLayout? by lazy { findViewById(R.id.layout_extra) }
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        title = getString(R.string.title_server)
-
-        val config = MmkvManager.decodeServerConfig(editGuid)
-        when (config?.configType ?: createConfigType) {
-            EConfigType.VMESS -> setContentView(R.layout.activity_server_vmess)
-            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(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val types = transportTypes(networks[position])
-                sp_header_type?.isEnabled = types.size > 1
-                val adapter =
-                    ArrayAdapter(this@ServerActivity, android.R.layout.simple_spinner_item, types)
-                adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                sp_header_type?.adapter = adapter
-                sp_header_type_title?.text =
-                    when (networks[position]) {
-                        NetworkType.GRPC.type -> getString(R.string.server_lab_mode_type)
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> getString(R.string.server_lab_xhttp_mode)
-                        else -> getString(R.string.server_lab_head_type)
-                    }.orEmpty()
-                sp_header_type?.setSelection(
-                    Utils.arrayFind(
-                        types,
-                        when (networks[position]) {
-                            NetworkType.GRPC.type -> config?.mode
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> config?.xhttpMode
-                            else -> config?.headerType
-                        }.orEmpty()
-                    )
-                )
-
-                et_request_host?.text = Utils.getEditable(
-                    when (networks[position]) {
-                        //"quic" -> config?.quicSecurity
-                        NetworkType.GRPC.type -> config?.authority
-                        else -> config?.host
-                    }.orEmpty()
-                )
-                et_path?.text = Utils.getEditable(
-                    when (networks[position]) {
-                        NetworkType.KCP.type -> config?.seed
-                        //"quic" -> config?.quicKey
-                        NetworkType.GRPC.type -> config?.serviceName
-                        else -> config?.path
-                    }.orEmpty()
-                )
-
-                tv_request_host?.text = Utils.getEditable(
-                    getString(
-                        when (networks[position]) {
-                            NetworkType.TCP.type -> R.string.server_lab_request_host_http
-                            NetworkType.WS.type -> R.string.server_lab_request_host_ws
-                            NetworkType.HTTP_UPGRADE.type -> R.string.server_lab_request_host_httpupgrade
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> R.string.server_lab_request_host_xhttp
-                            NetworkType.H2.type -> R.string.server_lab_request_host_h2
-                            //"quic" -> R.string.server_lab_request_host_quic
-                            NetworkType.GRPC.type -> R.string.server_lab_request_host_grpc
-                            else -> R.string.server_lab_request_host
-                        }
-                    )
-                )
-
-                tv_path?.text = Utils.getEditable(
-                    getString(
-                        when (networks[position]) {
-                            NetworkType.KCP.type -> R.string.server_lab_path_kcp
-                            NetworkType.WS.type -> R.string.server_lab_path_ws
-                            NetworkType.HTTP_UPGRADE.type -> R.string.server_lab_path_httpupgrade
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> R.string.server_lab_path_xhttp
-                            NetworkType.H2.type -> R.string.server_lab_path_h2
-                            //"quic" -> R.string.server_lab_path_quic
-                            NetworkType.GRPC.type -> R.string.server_lab_path_grpc
-                            else -> R.string.server_lab_path
-                        }
-                    )
-                )
-                et_extra?.text = Utils.getEditable(
-                    when (networks[position]) {
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> config?.xhttpExtra
-                        else -> null
-                    }.orEmpty()
-                )
-
-                layout_extra?.visibility =
-                    when (networks[position]) {
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> View.VISIBLE
-                        else -> View.GONE
-                    }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                // do nothing
-            }
-        }
-        sp_stream_security?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long,
-            ) {
-                val isBlank = streamSecuritys[position].isBlank()
-                val isTLS = streamSecuritys[position] == TLS
-
-                when {
-                    // Case 1: Null or blank
-                    isBlank -> {
-                        listOf(
-                            container_sni, container_fingerprint, container_alpn,
-                            container_allow_insecure, container_public_key,
-                            container_short_id, container_spider_x
-                        ).forEach { it?.visibility = View.GONE }
-                    }
-
-                    // Case 2: TLS value
-                    isTLS -> {
-                        listOf(
-                            container_sni,
-                            container_fingerprint,
-                            container_alpn
-                        ).forEach { it?.visibility = View.VISIBLE }
-                        container_allow_insecure?.visibility = View.VISIBLE
-                        listOf(
-                            container_public_key,
-                            container_short_id,
-                            container_spider_x
-                        ).forEach { it?.visibility = View.GONE }
-                    }
-
-                    // Case 3: Other reality values
-                    else -> {
-                        listOf(container_sni, container_fingerprint).forEach {
-                            it?.visibility = View.VISIBLE
-                        }
-                        container_alpn?.visibility = View.GONE
-                        container_allow_insecure?.visibility = View.GONE
-                        listOf(
-                            container_public_key,
-                            container_short_id,
-                            container_spider_x
-                        ).forEach { it?.visibility = View.VISIBLE }
-                    }
-                }
-            }
-
-            override fun onNothingSelected(p0: AdapterView<*>?) {
-                // do nothing
-            }
-        }
-        if (config != null) {
-            bindingServer(config)
-        } else {
-            clearServer()
-        }
-    }
-
-    /**
-     * binding selected server config
-     */
-    private fun bindingServer(config: ProfileItem): Boolean {
-
-        et_remarks.text = Utils.getEditable(config.remarks)
-        et_address.text = Utils.getEditable(config.server.orEmpty())
-        et_port.text = Utils.getEditable(config.serverPort ?: DEFAULT_PORT.toString())
-        et_id.text = Utils.getEditable(config.password.orEmpty())
-
-        if (config.configType == EConfigType.SOCKS || config.configType == EConfigType.HTTP) {
-            et_security?.text = Utils.getEditable(config.username.orEmpty())
-        } else if (config.configType == EConfigType.VLESS) {
-            et_security?.text = Utils.getEditable(config.method.orEmpty())
-            val flow = Utils.arrayFind(flows, config.flow.orEmpty())
-            if (flow >= 0) {
-                sp_flow?.setSelection(flow)
-            }
-        } else if (config.configType == EConfigType.WIREGUARD) {
-            et_id.text = Utils.getEditable(config.secretKey.orEmpty())
-            et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
-            et_preshared_key?.visibility = View.VISIBLE
-            et_preshared_key?.text = Utils.getEditable(config.preSharedKey.orEmpty())
-            et_reserved1?.text = Utils.getEditable(config.reserved ?: "0,0,0")
-            et_local_address?.text = Utils.getEditable(
-                config.localAddress ?: "$WIREGUARD_LOCAL_ADDRESS_V4,$WIREGUARD_LOCAL_ADDRESS_V6"
-            )
-            et_local_mtu?.text = Utils.getEditable(config.mtu?.toString() ?: WIREGUARD_LOCAL_MTU)
-        } else if (config.configType == EConfigType.HYSTERIA2) {
-            et_obfs_password?.text = Utils.getEditable(config.obfsPassword)
-            et_port_hop?.text = Utils.getEditable(config.portHopping)
-            et_port_hop_interval?.text = Utils.getEditable(config.portHoppingInterval)
-            et_pinsha256?.text = Utils.getEditable(config.pinSHA256)
-        }
-        val securityEncryptions =
-            if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
-        val security = Utils.arrayFind(securityEncryptions, config.method.orEmpty())
-        if (security >= 0) {
-            sp_security?.setSelection(security)
-        }
-
-        val streamSecurity = Utils.arrayFind(streamSecuritys, config.security.orEmpty())
-        if (streamSecurity >= 0) {
-            sp_stream_security?.setSelection(streamSecurity)
-            container_sni?.visibility = View.VISIBLE
-            container_fingerprint?.visibility = View.VISIBLE
-            container_alpn?.visibility = View.VISIBLE
-
-            et_sni?.text = Utils.getEditable(config.sni)
-            config.fingerPrint?.let {
-                val utlsIndex = Utils.arrayFind(uTlsItems, it)
-                sp_stream_fingerprint?.setSelection(utlsIndex)
-            }
-            config.alpn?.let {
-                val alpnIndex = Utils.arrayFind(alpns, it)
-                sp_stream_alpn?.setSelection(alpnIndex)
-            }
-            if (config.security == TLS) {
-                container_allow_insecure?.visibility = View.VISIBLE
-                val allowinsecure = Utils.arrayFind(allowinsecures, config.insecure.toString())
-                if (allowinsecure >= 0) {
-                    sp_allow_insecure?.setSelection(allowinsecure)
-                }
-                container_public_key?.visibility = View.GONE
-                container_short_id?.visibility = View.GONE
-                container_spider_x?.visibility = View.GONE
-            } else if (config.security == REALITY) {
-                container_public_key?.visibility = View.VISIBLE
-                et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
-                container_short_id?.visibility = View.VISIBLE
-                et_short_id?.text = Utils.getEditable(config.shortId.orEmpty())
-                container_spider_x?.visibility = View.VISIBLE
-                et_spider_x?.text = Utils.getEditable(config.spiderX.orEmpty())
-                container_allow_insecure?.visibility = View.GONE
-            }
-        }
-
-        if (config.security.isNullOrEmpty()) {
-            container_sni?.visibility = View.GONE
-            container_fingerprint?.visibility = View.GONE
-            container_alpn?.visibility = View.GONE
-            container_allow_insecure?.visibility = View.GONE
-            container_public_key?.visibility = View.GONE
-            container_short_id?.visibility = View.GONE
-            container_spider_x?.visibility = View.GONE
-        }
-        val network = Utils.arrayFind(networks, config.network.orEmpty())
-        if (network >= 0) {
-            sp_network?.setSelection(network)
-        }
-        return true
-    }
-
-    /**
-     * clear or init server config
-     */
-    private fun clearServer(): Boolean {
-        et_remarks.text = null
-        et_address.text = null
-        et_port.text = Utils.getEditable(DEFAULT_PORT.toString())
-        et_id.text = null
-        sp_security?.setSelection(0)
-        sp_network?.setSelection(0)
-
-        sp_header_type?.setSelection(0)
-        et_request_host?.text = null
-        et_path?.text = null
-        sp_stream_security?.setSelection(0)
-        sp_allow_insecure?.setSelection(0)
-        et_sni?.text = null
-
-        //et_security.text = null
-        sp_flow?.setSelection(0)
-        et_public_key?.text = null
-        et_reserved1?.text = Utils.getEditable("0,0,0")
-        et_local_address?.text =
-            Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
-        et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
-        return true
-    }
-
-    /**
-     * save server config
-     */
-    private fun saveServer(): Boolean {
-        if (TextUtils.isEmpty(et_remarks.text.toString())) {
-            toast(R.string.server_lab_remarks)
-            return false
-        }
-        if (TextUtils.isEmpty(et_address.text.toString())) {
-            toast(R.string.server_lab_address)
-            return false
-        }
-        if (createConfigType != EConfigType.HYSTERIA2) {
-            if (Utils.parseInt(et_port.text.toString()) <= 0) {
-                toast(R.string.server_lab_port)
-                return false
-            }
-        }
-        val config =
-            MmkvManager.decodeServerConfig(editGuid) ?: ProfileItem.create(createConfigType)
-        if (config.configType != EConfigType.SOCKS
-            && 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)
-            }
-            return false
-        }
-        sp_stream_security?.let {
-            if (config.configType == EConfigType.TROJAN && TextUtils.isEmpty(streamSecuritys[it.selectedItemPosition])) {
-                toast(R.string.server_lab_stream_security)
-                return false
-            }
-        }
-        if (et_extra?.text?.toString().isNotNullEmpty()) {
-            if (JsonUtil.parseString(et_extra?.text?.toString()) == null) {
-                toast(R.string.server_lab_xhttp_extra)
-                return false
-            }
-        }
-
-        saveCommon(config)
-        saveStreamSettings(config)
-        saveTls(config)
-
-        if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
-            config.subscriptionId = subscriptionId.orEmpty()
-        }
-        Log.d(ANG_PACKAGE, JsonUtil.toJsonPretty(config) ?: "")
-        MmkvManager.encodeServerConfig(editGuid, config)
-        toast(R.string.toast_success)
-        finish()
-        return true
-    }
-
-    private fun saveCommon(config: ProfileItem) {
-        config.remarks = et_remarks.text.toString().trim()
-        config.server = et_address.text.toString().trim()
-        config.serverPort = et_port.text.toString().trim()
-        config.password = et_id.text.toString().trim()
-
-        if (config.configType == EConfigType.VMESS) {
-            config.method = securitys[sp_security?.selectedItemPosition ?: 0]
-        } else if (config.configType == EConfigType.VLESS) {
-            config.method = et_security?.text.toString().trim()
-            config.flow = flows[sp_flow?.selectedItemPosition ?: 0]
-        } else if (config.configType == EConfigType.SHADOWSOCKS) {
-            config.method = shadowsocksSecuritys[sp_security?.selectedItemPosition ?: 0]
-        } else if (config.configType == EConfigType.SOCKS || config.configType == EConfigType.HTTP) {
-            if (!TextUtils.isEmpty(et_security?.text) || !TextUtils.isEmpty(et_id.text)) {
-                config.username = et_security?.text.toString().trim()
-            }
-        } else if (config.configType == EConfigType.TROJAN) {
-        } else if (config.configType == EConfigType.WIREGUARD) {
-            config.secretKey = et_id.text.toString().trim()
-            config.publicKey = et_public_key?.text.toString().trim()
-            config.preSharedKey = et_preshared_key?.text.toString().trim()
-            config.reserved = et_reserved1?.text.toString().trim()
-            config.localAddress = et_local_address?.text.toString().trim()
-            config.mtu = Utils.parseInt(et_local_mtu?.text.toString())
-        } else if (config.configType == EConfigType.HYSTERIA2) {
-            config.obfsPassword = et_obfs_password?.text?.toString()
-            config.portHopping = et_port_hop?.text?.toString()
-            config.portHoppingInterval = et_port_hop_interval?.text?.toString()
-            config.pinSHA256 = et_pinsha256?.text?.toString()
-        }
-    }
-
-
-    private fun saveStreamSettings(profileItem: ProfileItem) {
-        val network = sp_network?.selectedItemPosition ?: return
-        val type = sp_header_type?.selectedItemPosition ?: return
-        val requestHost = et_request_host?.text?.toString()?.trim() ?: return
-        val path = et_path?.text?.toString()?.trim() ?: return
-
-        profileItem.network = networks[network]
-        profileItem.headerType = transportTypes(networks[network])[type]
-        profileItem.host = requestHost
-        profileItem.path = path
-        profileItem.seed = path
-        profileItem.quicSecurity = requestHost
-        profileItem.quicKey = path
-        profileItem.mode = transportTypes(networks[network])[type]
-        profileItem.serviceName = path
-        profileItem.authority = requestHost
-        profileItem.xhttpMode = transportTypes(networks[network])[type]
-        profileItem.xhttpExtra = et_extra?.text?.toString()?.trim()
-    }
-
-    private fun saveTls(config: ProfileItem) {
-        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()) {
-                MmkvManager.decodeSettingsBool(PREF_ALLOW_INSECURE)
-            } else {
-                allowinsecures[allowInsecureField].toBoolean()
-            }
-
-        config.security = streamSecuritys[streamSecurity]
-        config.insecure = allowInsecure
-        config.sni = sniField
-        config.fingerPrint = uTlsItems[utlsIndex]
-        config.alpn = alpns[alpnIndex]
-        config.publicKey = publicKey
-        config.shortId = shortId
-        config.spiderX = spiderX
-    }
-
-    private fun transportTypes(network: String?): Array<out String> {
-        return when (network) {
-            NetworkType.TCP.type -> {
-                tcpTypes
-            }
-
-            NetworkType.KCP.type -> {
-                kcpAndQuicTypes
-            }
-
-            NetworkType.GRPC.type -> {
-                grpcModes
-            }
-
-            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
-                xhttpMode
-            }
-
-            else -> {
-                arrayOf("---")
-            }
-        }
-    }
-
-    /**
-     * delete server config
-     */
-    private fun deleteServer(): Boolean {
-        if (editGuid.isNotEmpty()) {
-            if (editGuid != MmkvManager.getSelectServer()) {
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
-                    AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
-                            MmkvManager.removeServer(editGuid)
-                            finish()
-                        }
-                        .setNegativeButton(android.R.string.no) { _, _ ->
-                            // do nothing
-                        }
-                        .show()
-                } else {
-                    MmkvManager.removeServer(editGuid)
-                    finish()
-                }
-            } else {
-                application.toast(R.string.toast_action_not_allowed)
-            }
-        }
-        return true
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.action_server, menu)
-        val delButton = menu.findItem(R.id.del_config)
-        val saveButton = menu.findItem(R.id.save_config)
-
-        if (editGuid.isNotEmpty()) {
-            if (isRunning) {
-                delButton?.isVisible = false
-                saveButton?.isVisible = false
-            }
-        } else {
-            delButton?.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)
-    }
-}
@@ -1,147 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.Menu
-import android.view.MenuItem
-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.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.fmt.CustomFmt
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.Utils
-import me.drakeet.support.toast.ToastCompat
-
-class ServerCustomConfigActivity : BaseActivity() {
-    private val binding by lazy { ActivityServerCustomConfigBinding.inflate(layoutInflater) }
-
-    private val editGuid by lazy { intent.getStringExtra("guid").orEmpty() }
-    private val isRunning by lazy {
-        intent.getBooleanExtra("isRunning", false)
-                && editGuid.isNotEmpty()
-                && editGuid == MmkvManager.getSelectServer()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.title_server)
-
-        if (!Utils.getDarkModeStatus(this)) {
-            binding.editor.colorScheme = EditorTheme.INTELLIJ_LIGHT
-        }
-        binding.editor.language = JsonLanguage()
-        val config = MmkvManager.decodeServerConfig(editGuid)
-        if (config != null) {
-            bindingServer(config)
-        } else {
-            clearServer()
-        }
-    }
-
-    /**
-     * Binding selected server config
-     */
-    private fun bindingServer(config: ProfileItem): Boolean {
-        binding.etRemarks.text = Utils.getEditable(config.remarks)
-        val raw = MmkvManager.decodeServerRaw(editGuid)
-        val configContent = raw.orEmpty()
-
-        binding.editor.setTextContent(Utils.getEditable(configContent))
-        return true
-    }
-
-    /**
-     * clear or init server config
-     */
-    private fun clearServer(): Boolean {
-        binding.etRemarks.text = null
-        return true
-    }
-
-    /**
-     * save server config
-     */
-    private fun saveServer(): Boolean {
-        if (TextUtils.isEmpty(binding.etRemarks.text.toString())) {
-            toast(R.string.server_lab_remarks)
-            return false
-        }
-
-        val profileItem = try {
-            CustomFmt.parse(binding.editor.text.toString())
-        } catch (e: Exception) {
-            e.printStackTrace()
-            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
-            return false
-        }
-
-        val config = MmkvManager.decodeServerConfig(editGuid) ?: ProfileItem.create(EConfigType.CUSTOM)
-        binding.etRemarks.text.let {
-            config.remarks = if (it.isNullOrEmpty()) profileItem?.remarks.orEmpty() else it.toString()
-        }
-        config.server = profileItem?.server
-        config.serverPort = profileItem?.serverPort
-
-        MmkvManager.encodeServerConfig(editGuid, config)
-        MmkvManager.encodeServerRaw(editGuid, binding.editor.text.toString())
-        toast(R.string.toast_success)
-        finish()
-        return true
-    }
-
-    /**
-     * save server config
-     */
-    private fun deleteServer(): Boolean {
-        if (editGuid.isNotEmpty()) {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    MmkvManager.removeServer(editGuid)
-                    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 delButton = menu.findItem(R.id.del_config)
-        val saveButton = menu.findItem(R.id.save_config)
-
-        if (editGuid.isNotEmpty()) {
-            if (isRunning) {
-                delButton?.isVisible = false
-                saveButton?.isVisible = false
-            }
-        } else {
-            delButton?.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)
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
2dust	879e25bb82	sdk28	2019-07-10 14:24:09 +08:00
2dust	c0e968ac34	up ver	2019-07-01 13:22:48 +08:00
2dust	29d3fb710b	ii	2019-05-15 10:17:59 +08:00