Chore: bump version

* Add .editorconfig

* Add .gitattributes

* Remove indent_style

* Remove .editorconfig

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary

.github/workflows/build-unsigned.yaml

@@ -1,5 +1,25 @@
 name: Build Unsigned
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '.idea/**'
+      - '.gitattributes'
+      - '.gitignore'
+      - '.gitmodules'
+      - '**.md'
+      - 'LICENSE'
+      - 'NOTICE'
+  pull_request:
+    paths-ignore:
+      - '.idea/**'
+      - '.gitattributes'
+      - '.gitignore'
+      - '.gitmodules'
+      - '**.md'
+      - 'LICENSE'
+      - 'NOTICE'
 jobs:
   BuildUnsigned:
     runs-on: ubuntu-latest
@@ -9,16 +29,18 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 11
+      - name: Gradle cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle/wrapper/gradle-wrapper.properties', '**/buildSrc/src/main/kotlin/**.kt') }}
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Setup Cmake & Ninja
-        uses: lukka/get-cmake@latest
+          go-version: 1.17
       - name: Build
-        run: ./gradlew --no-daemon app:assembleRelease
+        run: ./gradlew --no-daemon app:assembleFossRelease

.gitignore

@@ -19,11 +19,16 @@ gradle-app.setting
 # Ignore IDEA config
 *.iml
 /.idea/*
-/core/src/main/golang/.idea/*
 !/.idea/codeStyles
+/core/src/main/golang/.idea/*
 !/core/src/main/golang/.idea/codeStyles
+/core/src/foss/golang/.idea/*
+!/core/src/foss/golang/.idea/codeStyles
+/core/src/premium/golang/.idea/*
+!/core/src/premium/golang/.idea/codeStyles
 
 # KeyStore
+signing.properties
 *.keystore
 *.jks
 
@@ -33,8 +38,9 @@ cmake-build-*
 # local.properties
 local.properties
 
-# keystore
-keystore.properties
+
+# tracker
+tracker.properties
 
 # vscode
 .vscode
@@ -53,5 +59,5 @@ google-services.json
 # logs
 *.log
 
-# Ignore sum
-/core/src/main/golang/go.sum
+# MacOS
+.DS_Store

.gitmodules

@@ -1,9 +1,6 @@
-[submodule "core/src/main/golang/clash"]
-	path = core/src/main/golang/clash
+[submodule "clash-foss"]
+	path = core/src/foss/golang/clash
+	url = https://github.com/Kr328/clash.git
+[submodule "clash-premium"]
+	path = core/src/premium/golang/clash
 	url = https://github.com/Kr328/clash.git
-[submodule "kaidl"]
-	path = kaidl
-	url = https://github.com/Kr328/kaidl.git
-[submodule "core/src/main/golang/tun2socket"]
-	path = core/src/main/golang/tun2socket
-	url = https://github.com/Kr328/tun2socket-lwip.git

README.md

@@ -8,26 +8,20 @@ A Graphical user interface of [clash](https://github.com/Dreamacro/clash) for An
 
 Fully feature of [clash](https://github.com/Dreamacro/clash) ~~(Exclude `external-controller`~~
 
-
-
 ### Requirement
 
-* Android 5.0+ (minimum)
-* Android 7.0+ (recommend)
-* `armeabi-v7a` , `arm64-v8a`, `x86` or `x86_64` Architecture
+- Android 5.0+ (minimum)
+- Android 7.0+ (recommend)
+- `armeabi-v7a` , `arm64-v8a`, `x86` or `x86_64` Architecture
 
 ### License
 
 See also [LICENSE](./LICENSE) and [NOTICE](./NOTICE)
 
-
-
-###  Privacy Policy
+### Privacy Policy
 
 See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
 
-
-
 ### Build
 
 1. Update submodules
@@ -38,20 +32,20 @@ See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
 
 2. Install **OpenJDK 11**, **Android SDK**, **CMake** and **Golang**
 
-3. Create `local.properties` in project root with 
+3. Create `local.properties` in project root with
 
    ```properties
    sdk.dir=/path/to/android-sdk
    ```
 
-4. Create `keystore.properties` in project root with
+4. Create `signing.properties` in project root with
 
    ```properties
-   storeFile=/path/to/keystore/file
-   storePassword=<key store password>
-   keyAlias=<key alias>
-   keyPassword=<key password>
-   ``` 
+   keystore.path=/path/to/keystore/file
+   keystore.password=<key store password>
+   key.alias=<key alias>
+   key.password=<key password>
+   ```
 
 5. Build
 
@@ -59,4 +53,4 @@ See also [PRIVACY_POLICY.md](./PRIVACY_POLICY.md)
    ./gradlew app:assembleFossRelease
    ```
 
-6. Pick `app-release-<arch>.apk` in `app/build/outputs/apks`
+6. Pick `app-foss-<arch>-release.apk` in `app/build/outputs/apk/foss/release/`

app/build.gradle.kts

@@ -1,140 +1,32 @@
-import java.util.*
-
 plugins {
-    id("com.android.application")
     kotlin("android")
     kotlin("kapt")
-}
-
-android {
-    compileSdk = buildTargetSdkVersion
-
-    flavorDimensions(buildFlavor)
-
-    defaultConfig {
-        applicationId = "com.github.kr328.clash"
-
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        resConfigs("zh-rCN", "zh-rHK", "zh-rTW")
-
-        resValue("string", "release_name", "v$buildVersionName")
-        resValue("integer", "release_code", "$buildVersionCode")
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    productFlavors {
-        create("foss") {
-            dimension = "foss"
-            versionNameSuffix = ".foss"
-            applicationIdSuffix = ".foss"
-        }
-        create("premium") {
-            dimension = "premium"
-            versionNameSuffix = ".premium"
-
-            if (buildFlavor == "premium") {
-                val localFile = rootProject.file("local.properties")
-                if (localFile.exists()) {
-                    val appCenterKey = localFile.inputStream()
-                        .use { Properties().apply { load(it) } }
-                        .getProperty("appcenter.key", null)
-
-                    if (appCenterKey != null) {
-                        buildConfigField("String", "APP_CENTER_KEY", "\"$appCenterKey\"")
-                    } else {
-                        buildConfigField("String", "APP_CENTER_KEY", "null")
-                    }
-                } else {
-                    buildConfigField("String", "APP_CENTER_KEY", "null")
-                }
-            }
-        }
-    }
-
-    val signingFile = rootProject.file("keystore.properties")
-    if (signingFile.exists()) {
-        val properties = Properties().apply {
-            signingFile.inputStream().use {
-                load(it)
-            }
-        }
-        signingConfigs {
-            create("release") {
-                storeFile = rootProject.file(properties.getProperty("storeFile")!!)
-                storePassword = properties.getProperty("storePassword")!!
-                keyAlias = properties.getProperty("keyAlias")!!
-                keyPassword = properties.getProperty("keyPassword")!!
-            }
-        }
-        buildTypes {
-            named("release") {
-                signingConfig = signingConfigs["release"]
-            }
-        }
-    }
-
-    buildFeatures {
-        dataBinding = true
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    splits {
-        abi {
-            isEnable = true
-            isUniversalApk = true
-        }
-    }
+    id("com.android.application")
 }
 
 dependencies {
+    compileOnly(project(":hideapi"))
+
+    implementation(project(":core"))
+    implementation(project(":service"))
+    implementation(project(":design"))
+    implementation(project(":common"))
+
+    implementation(deps.kotlin.coroutine)
+    implementation(deps.androidx.core)
+    implementation(deps.androidx.activity)
+    implementation(deps.androidx.fragment)
+    implementation(deps.androidx.appcompat)
+    implementation(deps.androidx.coordinator)
+    implementation(deps.androidx.recyclerview)
+    implementation(deps.google.material)
+
     val premiumImplementation by configurations
 
-    api(project(":core"))
-    api(project(":service"))
-    api(project(":design"))
-    api(project(":common"))
-
-    premiumImplementation("com.microsoft.appcenter:appcenter-analytics:$appcenterVersion")
-    premiumImplementation("com.microsoft.appcenter:appcenter-crashes:$appcenterVersion")
-
-    implementation(kotlin("stdlib-jdk7"))
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("androidx.activity:activity:$activityVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
-    implementation("androidx.coordinatorlayout:coordinatorlayout:$coordinatorlayoutVersion")
-    implementation("androidx.recyclerview:recyclerview:$recyclerviewVersion")
-    implementation("androidx.fragment:fragment:$fragmentVersion")
-    implementation("com.google.android.material:material:$materialVersion")
+    premiumImplementation(deps.appcenter.analytics)
+    premiumImplementation(deps.appcenter.crashes)
 }
 
-task("cleanRelease", type = Delete::class) {
+tasks.getByName("clean", type = Delete::class) {
     delete(file("release"))
 }
-
-afterEvaluate {
-    tasks["clean"].dependsOn(tasks["cleanRelease"])
-}

app/proguard-rules.pro

@@ -31,3 +31,29 @@
     public static void checkParameterIsNotNull(...);
     public static void checkNotNullParameter(...);
 }
+
+# Kotlin Coroutine
+# Allow R8 to optimize away the FastServiceLoader.
+# Together with ServiceLoader optimization in R8
+# this results in direct instantiation when loading Dispatchers.Main
+-assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader {
+    boolean FAST_SERVICE_LOADER_ENABLED return false;
+}
+
+-assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt {
+    boolean ANDROID_DETECTED return true;
+}
+
+-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
+
+# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher
+-assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt {
+    boolean SUPPORT_MISSING return false;
+}
+
+# Statically turn off all debugging facilities and assertions
+-assumenosideeffects class kotlinx.coroutines.DebugKt {
+    boolean getASSERTIONS_ENABLED() return false;
+    boolean getDEBUG() return false;
+    boolean getRECOVER_STACK_TRACES() return false;
+}

app/src/premium/java/com/github/kr328/clash/Tracker.kt

@@ -8,7 +8,7 @@ import com.microsoft.appcenter.crashes.ingestion.models.ErrorAttachmentLog
 
 object Tracker {
     fun initialize(application: Application) {
-        if (BuildConfig.APP_CENTER_KEY != null && !BuildConfig.DEBUG) {
+        if (!BuildConfig.DEBUG) {
             AppCenter.start(
                 application,
                 BuildConfig.APP_CENTER_KEY,
@@ -18,7 +18,7 @@ object Tracker {
     }
 
     fun uploadLogcat(logcat: String) {
-        if (BuildConfig.APP_CENTER_KEY != null && !BuildConfig.DEBUG) {
+        if (!BuildConfig.DEBUG) {
             if (logcat.isNotBlank()) {
                 Crashes.trackError(
                     RuntimeException(),

build.gradle.kts

@@ -1,11 +1,163 @@
 @file:Suppress("UNUSED_VARIABLE")
 
+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.BaseExtension
 import java.net.URL
+import java.util.*
+
+buildscript {
+    repositories {
+        mavenCentral()
+        google()
+        maven("https://maven.kr328.app/releases")
+    }
+    dependencies {
+        classpath(deps.build.android)
+        classpath(deps.build.kotlin.common)
+        classpath(deps.build.kotlin.serialization)
+        classpath(deps.build.ksp)
+        classpath(deps.build.golang)
+    }
+}
 
 allprojects {
     repositories {
-        google()
         mavenCentral()
+        google()
+        maven("https://maven.kr328.app/releases")
+    }
+}
+
+subprojects {
+    val isApp = name == "app"
+
+    apply(plugin = if (isApp) "com.android.application" else "com.android.library")
+
+    extensions.configure<BaseExtension> {
+        val minSdkVersion = 21
+        val targetSdkVersion = 30
+        val buildVersionCode = 204014
+        val buildVersionName = "2.4.14"
+        val defaultDimension = "feature"
+
+        ndkVersion = "23.0.7599858"
+
+        compileSdkVersion(targetSdkVersion)
+
+        defaultConfig {
+            if (isApp) {
+                applicationId = "com.github.kr328.clash"
+            }
+
+            minSdk = minSdkVersion
+            targetSdk = targetSdkVersion
+
+            versionName = buildVersionName
+            versionCode = buildVersionCode
+
+            resValue("string", "release_name", "v$buildVersionName")
+            resValue("integer", "release_code", "$buildVersionCode")
+
+            externalNativeBuild {
+                cmake {
+                    abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
+                }
+            }
+
+            if (!isApp) {
+                consumerProguardFiles("consumer-rules.pro")
+            } else {
+                setProperty("archivesBaseName", "cfa-$versionName")
+            }
+        }
+
+        if (isApp) {
+            packagingOptions {
+                excludes.add("DebugProbesKt.bin")
+            }
+        }
+
+        productFlavors {
+            flavorDimensions(defaultDimension)
+
+            create("foss") {
+                dimension = defaultDimension
+                versionNameSuffix = ".foss"
+
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
+
+                if (isApp) {
+                    applicationIdSuffix = ".foss"
+                }
+            }
+            create("premium") {
+                dimension = defaultDimension
+                versionNameSuffix = ".premium"
+
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"true\")")
+
+                val tracker = rootProject.file("tracker.properties")
+                if (tracker.exists()) {
+                    val prop = Properties().apply {
+                        tracker.inputStream().use(this::load)
+                    }
+
+                    buildConfigField(
+                        "String",
+                        "APP_CENTER_KEY",
+                        "\"${prop.getProperty("appcenter.key")!!}\""
+                    )
+                }
+            }
+        }
+
+        signingConfigs {
+            val keystore = rootProject.file("signing.properties")
+            if (keystore.exists()) {
+                create("release") {
+                    val prop = Properties().apply {
+                        keystore.inputStream().use(this::load)
+                    }
+
+                    storeFile = rootProject.file(prop.getProperty("keystore.path")!!)
+                    storePassword = prop.getProperty("keystore.password")!!
+                    keyAlias = prop.getProperty("key.alias")!!
+                    keyPassword = prop.getProperty("key.password")!!
+                }
+            }
+        }
+
+        buildTypes {
+            named("release") {
+                isMinifyEnabled = isApp
+                isShrinkResources = isApp
+                signingConfig = signingConfigs.findByName("release")
+                proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            }
+            named("debug") {
+                versionNameSuffix = ".debug"
+            }
+        }
+
+        buildFeatures.apply {
+            dataBinding {
+                isEnabled = name != "hideapi"
+            }
+        }
+
+        if (isApp) {
+            this as AppExtension
+
+            splits {
+                abi {
+                    isEnable = true
+                    isUniversalApk = true
+                }
+            }
+        }
     }
 }
 
@@ -13,7 +165,7 @@ task("clean", type = Delete::class) {
     delete(rootProject.buildDir)
 }
 
-tasks.named<Wrapper>("wrapper") {
+tasks.wrapper {
     distributionType = Wrapper.DistributionType.ALL
 
     doLast {

buildSrc/build.gradle.kts

@@ -1,35 +0,0 @@
-plugins {
-    kotlin("jvm") version "1.5.0"
-    `java-gradle-plugin`
-}
-
-repositories {
-    mavenCentral()
-    google()
-}
-
-dependencies {
-    implementation(kotlin("stdlib"))
-
-    compileOnly(gradleApi())
-
-    api(kotlin("gradle-plugin"))
-    api(kotlin("serialization"))
-    api("com.android.tools.build:gradle:4.2.1") {
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
-        exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
-        exclude("org.jetbrains.kotlin", "kotlin-reflect")
-    }
-    api("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.5.0-1.0.0-alpha10") {
-        exclude("com.android.tools.build", "gradle")
-    }
-}
-
-gradlePlugin {
-    plugins {
-        create("golang") {
-            id = "clash-build"
-            implementationClass = "com.github.kr328.clash.tools.ClashBuildPlugin"
-        }
-    }
-}

buildSrc/src/main/java/Build.kt

@@ -1,17 +0,0 @@
-import org.gradle.api.Project
-
-const val buildVersionCode = 204005
-const val buildVersionName = "2.4.5"
-
-const val buildMinSdkVersion = 21
-const val buildTargetSdkVersion = 30
-
-const val buildNdkVersion = "22.1.7171670"
-
-val Project.buildFlavor: String
-    get() {
-        return if (project(":core").file("src/main/golang/clash/script/script.go").exists())
-            "premium"
-        else
-            "foss"
-    }

buildSrc/src/main/java/Dependencies.kt

@@ -1,13 +0,0 @@
-const val activityVersion = "1.2.3"
-const val coroutineVersion = "1.5.0"
-const val roomVersion = "2.3.0"
-const val coreVersion = "1.5.0"
-const val appcompatVersion = "1.3.0"
-const val muiltprocessVersion = "1.0.0"
-const val appcenterVersion = "4.1.1"
-const val serializationVersion = "1.2.1"
-const val materialVersion = "1.3.0"
-const val coordinatorlayoutVersion = "1.1.0"
-const val recyclerviewVersion = "1.2.0"
-const val fragmentVersion = "1.3.4"
-const val viewpagerVersion = "1.0.0"

buildSrc/src/main/java/Files.kt

@@ -1,8 +0,0 @@
-import org.gradle.api.Project
-import java.io.File
-
-val Project.golangSource: File
-    get() = file("src/main/golang")
-
-val Project.golangBuild: File
-    get() = buildDir.resolve("intermediates/golang")

buildSrc/src/main/java/com/github/kr328/clash/tools/BuildConfig.kt

@@ -1,23 +0,0 @@
-package com.github.kr328.clash.tools
-
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.api.BaseVariant
-import java.io.Serializable
-
-data class BuildConfig(
-    val debug: Boolean,
-    val premium: Boolean,
-    val abis: List<NativeAbi>,
-    val minSdkVersion: Int,
-) : Serializable {
-    companion object {
-        fun of(abis: List<NativeAbi>, minSdkVersion: Int, variant: BaseVariant): BuildConfig {
-            return BuildConfig(
-                debug = variant.buildType.isDebuggable,
-                premium = variant.flavorName == "premium",
-                abis = abis,
-                minSdkVersion = minSdkVersion
-            )
-        }
-    }
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildPlugin.kt

@@ -1,56 +0,0 @@
-package com.github.kr328.clash.tools
-
-import com.android.build.gradle.LibraryExtension
-import golangBuild
-import golangSource
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import java.util.*
-
-class ClashBuildPlugin : Plugin<Project> {
-    override fun apply(target: Project) {
-        target.afterEvaluate {
-            target.extensions.getByType(LibraryExtension::class.java).apply {
-                val abis = defaultConfig.externalNativeBuild.cmake.abiFilters
-                    .map { NativeAbi.parse(it) }
-                    .distinct()
-                val minSdkVersion = defaultConfig.minSdkVersion!!.apiLevel
-
-                target.tasks.register("cleanGolang", ClashCleanTask::class.java) {
-                    it.applyFrom(target, abis)
-
-                    target.tasks.getByName("clean").dependsOn(it)
-                }
-
-                libraryVariants.forEach { variant ->
-                    val config = BuildConfig.of(abis, minSdkVersion, variant)
-                    val buildDir = target.golangBuild.resolve(variant.name)
-                    val capitalize = variant.name.capitalize(Locale.getDefault())
-
-                    val task = target.tasks.register(
-                        "externalGolangBuild$capitalize",
-                        ClashBuildTask::class.java
-                    ) {
-                        it.config.set(config)
-                        it.ndkDirectory.set(ndkDirectory)
-                        it.inputDirectory.set(target.golangSource)
-                        it.outputDirectory.set(buildDir)
-                    }
-
-                    sourceSets.named(variant.name) {
-                        it.jniLibs {
-                            srcDir(buildDir)
-                        }
-                    }
-
-                    variant.externalNativeBuildProviders.forEach {
-                        it.get().dependsOn(task)
-                    }
-                    target.tasks.filter { it.name.startsWith("buildCMake") }.forEach {
-                        it.mustRunAfter(task)
-                    }
-                }
-            }
-        }
-    }
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/ClashBuildTask.kt

@@ -1,60 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
-import java.io.File
-
-abstract class ClashBuildTask : DefaultTask() {
-    abstract val config: Property<BuildConfig>
-        @Input get
-
-    abstract val ndkDirectory: DirectoryProperty
-        @InputDirectory get
-
-    abstract val inputDirectory: DirectoryProperty
-        @InputDirectory get
-
-    abstract val outputDirectory: DirectoryProperty
-        @OutputDirectory get
-
-    @TaskAction
-    fun build() {
-        val input = inputDirectory.file
-        val output = outputDirectory.file
-
-        val config = config.get()
-        val environment = Environment(ndkDirectory.file, config.minSdkVersion)
-
-        val tags = listOf("without_gvisor", "without_system") +
-                (if (config.debug) listOf("debug") else emptyList()) +
-                (if (config.premium) listOf("premium") else emptyList())
-
-        Command.ofGoModuleTidy(input).exec()
-
-        config.abis.forEach {
-            Command.ofGoRun(
-                "make/make.go",
-                listOf("tun2socket", ".", "android", it.goArch),
-                input.resolve("tun2socket"),
-                environment.ofLwipBuild(it)
-            ).exec()
-
-            Command.ofGoBuild(
-                "c-shared",
-                output.resolve("${it.value}/libclash.so"),
-                tags,
-                !config.debug,
-                input,
-                environment.ofCoreBuild(it)
-            ).exec()
-        }
-    }
-
-    private val DirectoryProperty.file: File
-        get() = get().asFile
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/ClashCleanTask.kt

@@ -1,17 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.Project
-import org.gradle.api.tasks.Delete
-import golangSource
-
-abstract class ClashCleanTask : Delete() {
-    fun applyFrom(project: Project, abis: List<NativeAbi>) {
-        val bridge = project.golangSource.resolve("tun2socket")
-
-        delete(bridge.resolve("build"))
-
-        abis.forEach {
-            delete(bridge.resolve("build_android_${it.goArch}.go"))
-        }
-    }
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/Command.kt

@@ -1,84 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.gradle.api.GradleException
-import java.io.File
-import kotlin.concurrent.thread
-
-class Command(
-    private val command: Array<String>,
-    workingDir: File,
-    environments: Map<String, String>
-) {
-    private val processBuilder: ProcessBuilder = ProcessBuilder(*command)
-        .redirectErrorStream(true)
-        .directory(workingDir)
-        .apply { environment().putAll(environments) }
-
-    fun exec() {
-        val process = processBuilder.start()
-
-        thread {
-            process.inputStream.copyTo(System.out)
-        }
-
-        val result = process.waitFor()
-
-        if (result != 0) {
-            throw GradleException("exec ${command.joinToString(" ")}: exit with $result")
-        }
-    }
-
-    companion object {
-        fun ofGoModuleTidy(workingDir: File): Command {
-            return Command(arrayOf("go", "mod", "tidy"), workingDir, System.getenv())
-        }
-
-        fun ofGoBuild(
-            mode: String,
-            output: File,
-            tags: List<String>,
-            strip: Boolean,
-            workingDir: File,
-            environments: Map<String, String>
-        ): Command {
-            val command = mutableListOf("go", "build")
-
-            // go build mode
-            command += "-buildmode"
-            command += mode
-
-            // output file
-            command += "-o"
-            command += output.absolutePath
-
-            // trim path prefix
-            command += "-trimpath"
-
-            if (tags.isNotEmpty()) {
-                command += "-tags"
-                command += tags.joinToString(",")
-            }
-
-            if (strip) {
-                command += "-ldflags"
-                command += "-s -w"
-            }
-
-            return Command(command.toTypedArray(), workingDir, environments)
-        }
-
-        fun ofGoRun(
-            file: String,
-            args: List<String>,
-            workingDir: File,
-            environments: Map<String, String>
-        ): Command {
-            val command = mutableListOf("go", "run")
-
-            command += file
-            command += args
-
-            return Command(command.toTypedArray(), workingDir, environments)
-        }
-    }
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/Environment.kt

@@ -1,58 +0,0 @@
-package com.github.kr328.clash.tools
-
-import org.apache.tools.ant.taskdefs.condition.Os
-import org.gradle.api.GradleException
-import java.io.File
-
-class Environment(
-    private val ndkDirectory: File,
-    private val minSdkVersion: Int,
-) {
-    fun ofCoreBuild(abi: NativeAbi): Map<String, String> {
-        val host = when {
-            Os.isFamily(Os.FAMILY_WINDOWS) ->
-                "windows"
-            Os.isFamily(Os.FAMILY_MAC) ->
-                "darwin"
-            Os.isFamily(Os.FAMILY_UNIX) ->
-                "linux"
-            else ->
-                throw GradleException("Unsupported host: ${System.getProperty("os.name")}")
-        }
-
-        val compiler = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.compiler}${minSdkVersion}-clang")
-
-        return mapOf(
-            "CC" to compiler.absolutePath,
-            "GOOS" to "android",
-            "GOARCH" to abi.goArch,
-            "GOARM" to abi.goArm,
-            "CGO_ENABLED" to "1",
-            "CFLAGS" to "-O3 -Werror",
-        )
-    }
-
-    fun ofLwipBuild(abi: NativeAbi): Map<String, String> {
-        val host = when {
-            Os.isFamily(Os.FAMILY_WINDOWS) ->
-                "windows"
-            Os.isFamily(Os.FAMILY_MAC) ->
-                "darwin"
-            Os.isFamily(Os.FAMILY_UNIX) ->
-                "linux"
-            else ->
-                throw GradleException("Unsupported host: ${System.getProperty("os.name")}")
-        }
-
-        val compiler = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.compiler}${minSdkVersion}-clang")
-        val ar = ndkDirectory.resolve("toolchains/llvm/prebuilt/$host-x86_64/bin")
-            .resolve("${abi.archiver}-ar")
-
-        return mapOf(
-            "CC" to compiler.absolutePath,
-            "AR" to ar.absolutePath,
-        )
-    }
-}

buildSrc/src/main/java/com/github/kr328/clash/tools/NativeAbi.kt

@@ -1,26 +0,0 @@
-package com.github.kr328.clash.tools
-
-enum class NativeAbi(
-    val value: String,
-    val compiler: String,
-    val archiver: String,
-    val goArch: String,
-    val goArm: String
-) {
-    ArmeabiV7a("armeabi-v7a", "armv7a-linux-androideabi", "arm-linux-androideabi", "arm", "7"),
-    Arm64V8a("arm64-v8a", "aarch64-linux-android", "aarch64-linux-android", "arm64", ""),
-    X86("x86", "i686-linux-android", "i686-linux-android", "386", ""),
-    X64("x86_64", "x86_64-linux-android", "x86_64-linux-android", "amd64", "");
-
-    companion object {
-        fun parse(value: String): NativeAbi {
-            return when (value) {
-                ArmeabiV7a.value -> ArmeabiV7a
-                Arm64V8a.value -> Arm64V8a
-                X86.value -> X86
-                X64.value -> X64
-                else -> throw IllegalArgumentException("unsupported abi $value")
-            }
-        }
-    }
-}

common/build.gradle.kts

@@ -1,50 +1,11 @@
 plugins {
-    id("com.android.library")
     kotlin("android")
-}
-
-android {
-    compileSdk = buildTargetSdkVersion
-
-    defaultConfig {
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+    id("com.android.library")
 }
 
 dependencies {
     compileOnly(project(":hideapi"))
 
-    implementation(kotlin("stdlib-jdk7"))
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
-}
-
-repositories {
-    mavenCentral()
-    google()
+    implementation(deps.kotlin.coroutine)
+    implementation(deps.androidx.core)
 }

common/src/main/res/values-zh-rTW/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="receive_clash_broadcasts">接收 Clash 廣播</string>
+    <string name="receive_broadcasts_of_clash">接收來自 Clash 內部的廣播</string>
+</resources>

core/build.gradle.kts

@@ -1,73 +1,50 @@
+import com.github.kr328.golang.GolangBuildTask
+import com.github.kr328.golang.GolangPlugin
 import java.io.FileOutputStream
 import java.net.URL
 import java.time.Duration
 
 plugins {
-    id("com.android.library")
     kotlin("android")
+    id("com.android.library")
     id("kotlinx-serialization")
-    id("clash-build")
+    id("golang-android")
 }
 
 val geoipDatabaseUrl =
     "https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb"
 val geoipInvalidate = Duration.ofDays(7)!!
 val geoipOutput = buildDir.resolve("intermediates/golang_blob")
+val golangSource = file("src/main/golang/native")
 
-android {
-    compileSdk = buildTargetSdkVersion
-
-    ndkVersion = buildNdkVersion
-
-    flavorDimensions(buildFlavor)
-
-    defaultConfig {
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        consumerProguardFiles("consumer-rules.pro")
-
-        externalNativeBuild {
-            cmake {
-                abiFilters("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
-                arguments(
-                    "-DGO_SOURCE:STRING=$golangSource",
-                    "-DGO_OUTPUT:STRING=$golangBuild",
-                    "-DFLAVOR_NAME=$buildFlavor",
-                )
-            }
-        }
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    productFlavors {
+golang {
+    sourceSets {
         create("foss") {
-            dimension = "foss"
+            tags.set(listOf("foss"))
+            srcDir.set(file("src/foss/golang"))
         }
         create("premium") {
-            dimension = "premium"
+            tags.set(listOf("premium", "without_gvisor", "without_system"))
+            srcDir.set(file("src/premium/golang"))
+        }
+        all {
+            fileName.set("libclash.so")
+            packageName.set("cfa/native")
         }
     }
+}
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
+android {
+    productFlavors {
+        all {
+            externalNativeBuild {
+                cmake {
+                    arguments("-DGO_SOURCE:STRING=${golangSource}")
+                    arguments("-DGO_OUTPUT:STRING=${GolangPlugin.outputDirOf(project, null, null)}")
+                    arguments("-DFLAVOR_NAME:STRING=$name")
+                }
+            }
+        }
     }
 
     externalNativeBuild {
@@ -78,16 +55,17 @@ android {
 }
 
 dependencies {
-    api(project(":common"))
+    implementation(project(":common"))
 
-    implementation(kotlin("stdlib-jdk7"))
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
+    implementation(deps.androidx.core)
+    implementation(deps.kotlin.coroutine)
+    implementation(deps.kotlin.serialization.json)
 }
 
-repositories {
-    mavenCentral()
+afterEvaluate {
+    tasks.withType(GolangBuildTask::class.java).forEach {
+        it.inputs.dir(golangSource)
+    }
 }
 
 task("downloadGeoipDatabase") {
@@ -108,6 +86,8 @@ task("downloadGeoipDatabase") {
         var GeoipDatabase []byte
     """.trimIndent()
 
+    outputs.dir(geoipOutput)
+
     onlyIf {
         System.currentTimeMillis() - databaseFile.lastModified() > geoipInvalidate.toMillis()
     }

core/src/foss/golang/go.mod

@@ -0,0 +1,35 @@
+module foss
+
+go 1.17
+
+require cfa v0.0.0
+
+require (
+	cfa/blob v0.0.0 // indirect
+	github.com/Dreamacro/clash v1.7.1 // indirect
+	github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
+	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
+	github.com/kr328/tun2socket-lwip v0.0.0-20211015022349-94b5374d46e5 // indirect
+	github.com/miekg/dns v1.1.43 // indirect
+	github.com/oschwald/geoip2-golang v1.5.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.8.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
+	go.etcd.io/bbolt v1.3.6 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)
+
+replace cfa => ../../main/golang
+
+replace github.com/Dreamacro/clash => ./clash
+
+replace cfa/blob => ../../../build/intermediates/golang_blob

core/src/foss/golang/go.sum

@@ -0,0 +1,120 @@
+github.com/Dreamacro/go-shadowsocks2 v0.1.7 h1:8CtbE1HoPPMfrQZGXmlluq6dO2lL31W6WRRE8fabc4Q=
+github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
+github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
+github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/kr328/tun2socket-lwip v0.0.0-20211011111457-aee61f59119e/go.mod h1:JFkXLCpLkNVvLMRkq3gexTlRHfzbqcP5HfFOoq5Mj+g=
+github.com/kr328/tun2socket-lwip v0.0.0-20211015020707-5db8ce531486 h1:vr7UW621Q53YUKUlsXojehQ4dtKXwyzin0hjwegC7gw=
+github.com/kr328/tun2socket-lwip v0.0.0-20211015020707-5db8ce531486/go.mod h1:JFkXLCpLkNVvLMRkq3gexTlRHfzbqcP5HfFOoq5Mj+g=
+github.com/kr328/tun2socket-lwip v0.0.0-20211015022349-94b5374d46e5 h1:Hsz4nGstXCWTLjf3mFDytJ0u1HfbrOfvbWRfphsLvBg=
+github.com/kr328/tun2socket-lwip v0.0.0-20211015022349-94b5374d46e5/go.mod h1:JFkXLCpLkNVvLMRkq3gexTlRHfzbqcP5HfFOoq5Mj+g=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw=
+github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s=
+github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk=
+github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/src/foss/golang/main.go

@@ -0,0 +1,5 @@
+package golang
+
+import (
+	_ "cfa/native/all"
+)

core/src/main/cpp/CMakeLists.txt

@@ -19,7 +19,6 @@ endif ()
 
 include_directories("${GO_OUTPUT_BASE}/${CMAKE_ANDROID_ARCH_ABI}")
 include_directories("${GO_SOURCE}")
-include_directories("${GO_SOURCE}/tun2socket/bridge/native")
 
 link_directories("${GO_OUTPUT_BASE}/${CMAKE_ANDROID_ARCH_ABI}")
 

core/src/main/cpp/main.c

@@ -84,6 +84,16 @@ Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyDnsChanged(JNIEnv *en
     notifyDnsChanged(_dns_list);
 }
 
+JNIEXPORT void JNICALL
+Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyTimeZoneChanged(JNIEnv *env, jobject thiz,
+                                                                           jstring name, jint offset) {
+    TRACE_METHOD();
+
+    scoped_string _name = get_string(name);
+
+    notifyTimeZoneChanged(_name, offset);
+}
+
 JNIEXPORT void JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyInstalledAppChanged(JNIEnv *env,
                                                                                jobject thiz,
@@ -98,15 +108,15 @@ Java_com_github_kr328_clash_core_bridge_Bridge_nativeNotifyInstalledAppChanged(J
 JNIEXPORT void JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_nativeStartTun(JNIEnv *env, jobject thiz,
                                                               jint fd, jint mtu,
-                                                              jstring gateway, jstring dns,
+                                                              jstring dns, jstring blocking,
                                                               jobject cb) {
     TRACE_METHOD();
 
-    scoped_string _gateway = get_string(gateway);
+    scoped_string _blocking = get_string(blocking);
     scoped_string _dns = get_string(dns);
     jobject _interface = new_global(cb);
 
-    startTun(fd, mtu, _gateway, _dns, _interface);
+    startTun(fd, mtu, _dns, _blocking, _interface);
 }
 
 JNIEXPORT void JNICALL

core/src/main/golang/app/dns.go

@@ -1,15 +0,0 @@
-package app
-
-import "strings"
-
-var systemDns []string
-
-func NotifyDnsChanged(dnsList string) {
-	dns := strings.Split(dnsList, ",")
-
-	systemDns = dns
-}
-
-func SystemDns() []string {
-	return systemDns
-}

core/src/main/golang/go.mod

@@ -1,20 +1,28 @@
 module cfa
 
-go 1.16
+go 1.17
 
 require (
-	cfa/blob v0.0.0 // local generated
-	github.com/Dreamacro/clash v0.0.0 // local
+	github.com/Dreamacro/clash v1.7.1
 	github.com/dlclark/regexp2 v1.4.0
-	github.com/kr328/tun2socket v0.0.0 // local
-	github.com/miekg/dns v1.1.42
+	github.com/kr328/tun2socket-lwip v0.0.0-20211011111457-aee61f59119e
+	github.com/miekg/dns v1.1.43
 	github.com/oschwald/geoip2-golang v1.5.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-replace github.com/Dreamacro/clash => ./clash
-
-replace github.com/kr328/tun2socket => ./tun2socket
-
-replace cfa/blob => ../../../build/intermediates/golang_blob
+require (
+	github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
+	github.com/oschwald/maxminddb-golang v1.8.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
+	golang.org/x/text v0.3.6 // indirect
+)

core/src/main/golang/go.sum

@@ -0,0 +1,116 @@
+github.com/Dreamacro/clash v1.7.1 h1:8iYYiyVf7ZAztwoFeTFihs5rI9Jjic0ZKmf05vQxzFU=
+github.com/Dreamacro/clash v1.7.1/go.mod h1:C9eLMAlDZSLrkdzGQdOHyeldwRjDbcGR2kaL80KdzGw=
+github.com/Dreamacro/go-shadowsocks2 v0.1.7 h1:8CtbE1HoPPMfrQZGXmlluq6dO2lL31W6WRRE8fabc4Q=
+github.com/Dreamacro/go-shadowsocks2 v0.1.7/go.mod h1:8p5G4cAj5ZlXwUR+Ww63gfSikr8kvw8uw3TDwLAJpUc=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
+github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/fanliao/go-promise v0.0.0-20141029170127-1890db352a72/go.mod h1:PjfxuH4FZdUyfMdtBio2lsRr1AKEaVPwelzuHuh8Lqc=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac h1:IO6EfdRnPhxgKOsk9DbewdtQZHKZKnGlW7QCUttvNys=
+github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
+github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
+github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/kr328/tun2socket-lwip v0.0.0-20211011111457-aee61f59119e h1:Q3VT9AKP8hLyR7gAhU0Wnt21kIXcgdt8dMbSOjfEd98=
+github.com/kr328/tun2socket-lwip v0.0.0-20211011111457-aee61f59119e/go.mod h1:JFkXLCpLkNVvLMRkq3gexTlRHfzbqcP5HfFOoq5Mj+g=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY=
+github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o=
+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
+github.com/oschwald/geoip2-golang v1.5.0 h1:igg2yQIrrcRccB1ytFXqBfOHCjXWIoMv85lVJ1ONZzw=
+github.com/oschwald/geoip2-golang v1.5.0/go.mod h1:xdvYt5xQzB8ORWFqPnqMwZpCpgNagttWdoZLlJQzg7s=
+github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk=
+github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c h1:BFvcl34IGnw8yvJi8hlqLFo9EshRInwWBs2M5fGWzQA=
+github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg=
+golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 h1:GkvMjFtXUmahfDtashnc1mnrCtuBVcwse5QV2lUk/tI=
+golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

core/src/main/golang/native/all/imports.go

@@ -0,0 +1,16 @@
+package all
+
+import (
+	_ "cfa/native/app"
+	_ "cfa/native/common"
+	_ "cfa/native/config"
+	_ "cfa/native/delegate"
+	_ "cfa/native/platform"
+	_ "cfa/native/proxy"
+	_ "cfa/native/tun"
+	_ "cfa/native/tunnel"
+
+	_ "golang.org/x/sync/semaphore"
+
+	_ "github.com/Dreamacro/clash/log"
+)

core/src/main/golang/native/app.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"unsafe"
 
-	"cfa/app"
+	"cfa/native/app"
 
 	"github.com/Dreamacro/clash/log"
 )
@@ -43,6 +43,12 @@ func notifyInstalledAppsChanged(uids C.c_string) {
 	app.NotifyInstallAppsChanged(u)
 }
 
+//export notifyTimeZoneChanged
+func notifyTimeZoneChanged(name C.c_string, offset C.int) {
+	app.NotifyTimeZoneChanged(C.GoString(name), int(offset))
+}
+
+
 //export queryConfiguration
 func queryConfiguration() *C.char {
 	response := &struct{}{}

core/src/main/golang/native/app/app.go

@@ -3,6 +3,7 @@ package app
 import (
 	"strconv"
 	"strings"
+	"time"
 )
 
 var appVersionName string
@@ -46,3 +47,7 @@ func NotifyInstallAppsChanged(uidList string) {
 func QueryAppByUid(uid int) string {
 	return installedAppsUid[uid]
 }
+
+func NotifyTimeZoneChanged(name string, offset int) {
+	time.Local = time.FixedZone(name, offset)
+}

core/src/main/golang/native/app/dns.go

@@ -0,0 +1,20 @@
+package app
+
+import (
+	"strings"
+
+	"github.com/Dreamacro/clash/dns"
+)
+
+func NotifyDnsChanged(dnsList string) {
+	dL := strings.Split(dnsList, ",")
+
+	ns := make([]dns.NameServer, 0, len(dnsList))
+	for _, d := range dL {
+		ns = append(ns, dns.NameServer{Addr: d})
+	}
+
+	dns.UpdateSystemDNS(dL)
+	dns.FlushCacheWithDefaultResolver()
+}
+

core/src/main/golang/native/app/tun.go

@@ -1,10 +1,11 @@
 package app
 
 import (
-	"cfa/platform"
 	"net"
 	"strings"
 	"syscall"
+
+	"cfa/native/platform"
 )
 
 var markSocketImpl func(fd int)

core/src/main/golang/native/config.go

@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"unsafe"
 
-	"cfa/config"
+	"cfa/native/config"
 )
 
 type remoteValidCallback struct {

core/src/main/golang/native/config/fetch.go

@@ -11,8 +11,7 @@ import (
 	"runtime"
 	"time"
 
-	"cfa/app"
-
+	"cfa/native/app"
 	"github.com/Dreamacro/clash/component/dialer"
 )
 
@@ -25,13 +24,12 @@ type Status struct {
 
 var client = &http.Client{
 	Transport: &http.Transport{
-		// from http.DefaultTransport
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
+		DisableKeepAlives:     true,
 		TLSHandshakeTimeout:   10 * time.Second,
 		ExpectContinueTimeout: 1 * time.Second,
 		DialContext:           dialer.DefaultTunnelDialer,
 	},
+	Timeout: 60 * time.Second,
 }
 
 func openUrl(url string) (io.ReadCloser, error) {

core/src/main/golang/native/config/load.go

@@ -3,12 +3,12 @@ package config
 import (
 	"io/ioutil"
 	P "path"
+	"runtime"
 	"strings"
 
 	"gopkg.in/yaml.v2"
 
-	"cfa/app"
-
+	"cfa/native/app"
 	"github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 
@@ -81,6 +81,8 @@ func Load(path string) error {
 
 	app.ApplySubtitlePattern(rawCfg.ClashForAndroid.UiSubtitlePattern)
 
+	runtime.GC()
+
 	return nil
 }
 

core/src/main/golang/native/config/process.go

@@ -5,17 +5,22 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"time"
 
-	"github.com/Dreamacro/clash/log"
 	"github.com/dlclark/regexp2"
 
-	"cfa/app"
-	"cfa/common"
+	"cfa/native/common"
+	"github.com/Dreamacro/clash/log"
 
 	"github.com/Dreamacro/clash/config"
 	"github.com/Dreamacro/clash/dns"
 )
 
+const (
+	defaultHealthCheckUrl      = "https://www.gstatic.com/generate_204"
+	defaultHealthCheckInterval = time.Hour
+)
+
 var processors = []processor{
 	patchOverride,
 	patchGeneral,
@@ -70,7 +75,7 @@ func patchDns(cfg *config.RawConfig, _ string) error {
 	}
 
 	if cfg.ClashForAndroid.AppendSystemDNS {
-		cfg.DNS.NameServer = append(cfg.DNS.NameServer, app.SystemDns()...)
+		cfg.DNS.NameServer = append(cfg.DNS.NameServer, "dhcp://" + dns.SystemDNSPlaceholder)
 	}
 
 	return nil
@@ -88,7 +93,13 @@ func patchProviders(cfg *config.RawConfig, profileDir string) error {
 
 func patchProxyGroup(cfg *config.RawConfig, _ string) error {
 	for _, g := range cfg.ProxyGroup {
-		g["lazy"] = false
+		if _, exist := g["url"]; !exist {
+			g["url"] = defaultHealthCheckUrl
+		}
+
+		if _, exist := g["interval"]; !exist {
+			g["interval"] = int(defaultHealthCheckInterval.Seconds())
+		}
 	}
 
 	return nil

core/src/main/golang/native/config/provider_open.go

@@ -2,7 +2,11 @@
 
 package config
 
-import "github.com/Dreamacro/clash/config"
+import (
+	"io"
+
+	"github.com/Dreamacro/clash/config"
+)
 
 func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]interface{})) {
 	total := len(rawCfg.ProxyProvider)
@@ -17,6 +21,6 @@ func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, k
 
 func destroyProviders(cfg *config.Config) {
 	for _, p := range cfg.Providers {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}
 }

core/src/main/golang/native/config/provider_premium.go

@@ -2,7 +2,11 @@
 
 package config
 
-import "github.com/Dreamacro/clash/config"
+import (
+	"io"
+
+	"github.com/Dreamacro/clash/config"
+)
 
 func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, key string, provider map[string]interface{})) {
 	total := len(rawCfg.ProxyProvider) + len(rawCfg.RuleProvider)
@@ -23,10 +27,10 @@ func forEachProviders(rawCfg *config.RawConfig, fun func(index int, total int, k
 
 func destroyProviders(cfg *config.Config) {
 	for _, p := range cfg.ProxyProviders {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}
 
 	for _, p := range cfg.RuleProviders {
-		_ = p.Destroy()
+		_ = p.(io.Closer).Close()
 	}
 }

core/src/main/golang/native/delegate/init.go

@@ -1,15 +1,13 @@
-package core
+package delegate
 
 import (
 	"errors"
-	"net"
 	"syscall"
 
 	"cfa/blob"
 
-	"cfa/app"
-	"cfa/platform"
-
+	"cfa/native/app"
+	"cfa/native/platform"
 	"github.com/Dreamacro/clash/component/process"
 	"github.com/Dreamacro/clash/log"
 
@@ -41,34 +39,13 @@ func Init(home, versionName string, platformVersion int) {
 		return pkg, nil
 	}
 
-	dialer.DialerHook = func(dialer *net.Dialer) error {
-		dialer.Control = func(network, address string, c syscall.RawConn) error {
-			return c.Control(func(fd uintptr) {
-				app.MarkSocket(int(fd))
-			})
-		}
-
-		return nil
-	}
-	dialer.ListenPacketHook = func(lc *net.ListenConfig, address string) (string, error) {
-		lc.Control = func(network, address string, c syscall.RawConn) error {
-			return c.Control(func(fd uintptr) {
-				app.MarkSocket(int(fd))
-			})
-		}
-
-		if platform.ShouldBlockConnection() {
-			return "", errBlocked
-		}
-
-		return address, nil
-	}
-
-	dialer.DialHook = func(dialer *net.Dialer, network string, ip net.IP) error {
+	dialer.DefaultSocketHook = func(network, address string, conn syscall.RawConn) error {
 		if platform.ShouldBlockConnection() {
 			return errBlocked
 		}
 
-		return nil
+		return conn.Control(func(fd uintptr) {
+			app.MarkSocket(int(fd))
+		})
 	}
 }

core/src/main/golang/native/main.go

@@ -10,9 +10,9 @@ import "C"
 import (
 	"runtime"
 
-	"cfa/config"
-	"cfa/core"
-	"cfa/tunnel"
+	"cfa/native/config"
+	"cfa/native/delegate"
+	"cfa/native/tunnel"
 
 	"github.com/Dreamacro/clash/log"
 )
@@ -27,7 +27,7 @@ func coreInit(home, versionName C.c_string, sdkVersion C.int) {
 	v := C.GoString(versionName)
 	s := int(sdkVersion)
 
-	core.Init(h, v, s)
+	delegate.Init(h, v, s)
 
 	reset()
 }

core/src/main/golang/native/proxy.go

@@ -3,7 +3,9 @@ package main
 //#include "bridge.h"
 import "C"
 
-import "cfa/proxy"
+import (
+	"cfa/native/proxy"
+)
 
 //export startHttp
 func startHttp(listenAt C.c_string) *C.char {

core/src/main/golang/native/proxy/http.go

@@ -0,0 +1,40 @@
+package proxy
+
+import (
+	"sync"
+
+	"github.com/Dreamacro/clash/listener/http"
+	"github.com/Dreamacro/clash/tunnel"
+)
+
+var listener *http.Listener
+var lock sync.Mutex
+
+func Start(listen string) (listenAt string, err error) {
+	lock.Lock()
+	defer lock.Unlock()
+
+	stopLocked()
+
+	listener, err = http.NewWithAuthenticate(listen, tunnel.TCPIn(), false)
+	if err == nil {
+		listenAt = listener.Listener().Addr().String()
+	}
+
+	return
+}
+
+func Stop() {
+	lock.Lock()
+	defer lock.Unlock()
+
+	stopLocked()
+}
+
+func stopLocked() {
+	if listener != nil {
+		listener.Close()
+	}
+
+	listener = nil
+}

core/src/main/golang/native/tun.go

@@ -7,10 +7,10 @@ import (
 	"context"
 	"unsafe"
 
-	"cfa/app"
-	"cfa/tun"
-
 	"golang.org/x/sync/semaphore"
+
+	"cfa/native/app"
+	"cfa/native/tun"
 )
 
 type remoteTun struct {

core/src/main/golang/native/tun/dns.go

@@ -3,7 +3,8 @@ package tun
 import (
 	"net"
 
-	"github.com/Dreamacro/clash/component/resolver"
+	"github.com/Dreamacro/clash/dns"
+
 	D "github.com/miekg/dns"
 )
 
@@ -21,7 +22,7 @@ func relayDns(payload []byte) ([]byte, error) {
 		return nil, err
 	}
 
-	r, err := resolver.ServeMsg(msg)
+	r, err := dns.ServeDNSWithDefaultServer(msg)
 	if err != nil {
 		return nil, err
 	}

core/src/main/golang/native/tun/tcp.go

@@ -20,6 +20,7 @@ func (a *adapter) tcp() {
 	defer log.Infoln("[ATUN] TCP listener exited")
 	defer a.stack.Close()
 
+accept:
 	for {
 		conn, err := a.stack.TCP().Accept()
 		if err != nil {
@@ -34,14 +35,18 @@ func (a *adapter) tcp() {
 			continue
 		}
 
-		// drop all connections connect to gateway
-		if a.gateway.Contains(tAddr.IP) {
-			continue
+		// drop all connections connect to blocking list
+		for _, b := range a.blocking {
+			if b.Contains(tAddr.IP) {
+				_ = conn.Close()
+
+				continue accept
+			}
 		}
 
 		metadata := &C.Metadata{
 			NetWork:    C.TCP,
-			Type:       C.SOCKS,
+			Type:       C.SOCKS5,
 			SrcIP:      sAddr.IP,
 			DstIP:      tAddr.IP,
 			SrcPort:    strconv.Itoa(sAddr.Port),
@@ -52,7 +57,7 @@ func (a *adapter) tcp() {
 			RawDstAddr: tAddr,
 		}
 
-		tunnel.Add(context.NewConnContext(conn, metadata))
+		tunnel.TCPIn() <- context.NewConnContext(conn, metadata)
 	}
 }
 

core/src/main/golang/native/tun/tun.go

@@ -3,20 +3,21 @@ package tun
 import (
 	"net"
 	"os"
+	"strings"
 	"sync"
 	"syscall"
 
-	"github.com/kr328/tun2socket"
+	"github.com/kr328/tun2socket-lwip"
 )
 
 type adapter struct {
-	device  *os.File
-	stack   tun2socket.Stack
-	gateway *net.IPNet
-	dns     net.IP
-	mtu     int
-	once    sync.Once
-	stop    func()
+	device   *os.File
+	stack    tun2socket.Stack
+	blocking []*net.IPNet
+	dns      net.IP
+	mtu      int
+	once     sync.Once
+	stop     func()
 }
 
 var lock sync.Mutex
@@ -27,7 +28,7 @@ func (a *adapter) close() {
 	_ = a.device.Close()
 }
 
-func Start(fd, mtu int, gateway, dns string, stop func()) error {
+func Start(fd, mtu int, dns string, blocking string, stop func()) error {
 	lock.Lock()
 	defer lock.Unlock()
 
@@ -46,16 +47,28 @@ func Start(fd, mtu int, gateway, dns string, stop func()) error {
 	}
 
 	dn := net.ParseIP(dns)
-	_, gw, _ := net.ParseCIDR(gateway)
+
+	var blk []*net.IPNet
+
+	for _, b := range strings.Split(blocking, ";") {
+		_, n, err := net.ParseCIDR(b)
+		if err != nil {
+			device.Close()
+
+			return err
+		}
+
+		blk = append(blk, n)
+	}
 
 	instance = &adapter{
-		device:  device,
-		stack:   stack,
-		gateway: gw,
-		dns:     dn,
-		mtu:     mtu,
-		once:    sync.Once{},
-		stop:    stop,
+		device:   device,
+		stack:    stack,
+		blocking: blk,
+		dns:      dn,
+		mtu:      mtu,
+		once:     sync.Once{},
+		stop:     stop,
 	}
 
 	go instance.rx()

core/src/main/golang/native/tun/udp.go

@@ -3,14 +3,14 @@ package tun
 import (
 	"net"
 
-	"github.com/Dreamacro/clash/log"
-	"github.com/Dreamacro/clash/transport/socks5"
-	"github.com/kr328/tun2socket"
-
-	adapters "github.com/Dreamacro/clash/adapters/inbound"
+	"github.com/Dreamacro/clash/adapter/inbound"
 	"github.com/Dreamacro/clash/common/pool"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/log"
+	"github.com/Dreamacro/clash/transport/socks5"
 	"github.com/Dreamacro/clash/tunnel"
+
+	"github.com/kr328/tun2socket-lwip"
 )
 
 type packet struct {
@@ -44,6 +44,7 @@ func (a *adapter) udp() {
 	defer log.Infoln("[ATUN] UDP receiver exited")
 	defer a.stack.Close()
 
+read:
 	for {
 		buf := pool.Get(a.mtu)
 
@@ -60,11 +61,11 @@ func (a *adapter) udp() {
 			continue
 		}
 
-		// drop all packets send to gateway
-		if a.gateway.Contains(tAddr.IP) {
-			pool.Put(buf)
-
-			continue
+		// drop all packet send to blocking list
+		for _, b := range a.blocking {
+			if b.Contains(tAddr.IP) {
+				continue read
+			}
 		}
 
 		pkt := &packet{
@@ -73,9 +74,7 @@ func (a *adapter) udp() {
 			data:  buf[:n],
 		}
 
-		adapter := adapters.NewPacket(socks5.ParseAddrToSocksAddr(tAddr), pkt, C.SOCKS)
-
-		tunnel.AddPacket(adapter)
+		tunnel.UDPIn() <- inbound.NewPacket(socks5.ParseAddrToSocksAddr(tAddr), pkt, C.SOCKS5)
 	}
 }
 

core/src/main/golang/native/tunnel.go

@@ -6,8 +6,8 @@ import "C"
 import (
 	"unsafe"
 
-	"cfa/app"
-	"cfa/tunnel"
+	"cfa/native/app"
+	"cfa/native/tunnel"
 )
 
 //export queryTunnelState

core/src/main/golang/native/tunnel/connectivity.go

@@ -3,9 +3,9 @@ package tunnel
 import (
 	"sync"
 
-	"github.com/Dreamacro/clash/adapters/outbound"
-	"github.com/Dreamacro/clash/adapters/outboundgroup"
-	"github.com/Dreamacro/clash/adapters/provider"
+	"github.com/Dreamacro/clash/adapter"
+	"github.com/Dreamacro/clash/adapter/outboundgroup"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 )
@@ -19,7 +19,7 @@ func HealthCheck(name string) {
 		return
 	}
 
-	g, ok := p.(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
+	g, ok := p.(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
 	if !ok {
 		log.Warnln("Request health check for `%s`: invalid type %s", name, p.Type().String())
 

core/src/main/golang/native/tunnel/providers.go

@@ -7,7 +7,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Dreamacro/clash/adapters/provider"
+	P "github.com/Dreamacro/clash/adapter/provider"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/tunnel"
 )
 
@@ -38,7 +39,7 @@ func QueryProviders() []*Provider {
 	for _, p := range providers {
 		updatedAt := time.Time{}
 
-		if s, ok := p.(provider.UpdatableProvider); ok {
+		if s, ok := p.(P.UpdatableProvider); ok {
 			updatedAt = s.UpdatedAt()
 		}
 

core/src/main/golang/native/tunnel/providers_premium.go

@@ -7,7 +7,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Dreamacro/clash/adapters/provider"
+	P "github.com/Dreamacro/clash/adapter/provider"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 )
@@ -48,7 +49,7 @@ func QueryProviders() []*Provider {
 	for _, p := range providers {
 		updatedAt := time.Time{}
 
-		if s, ok := p.(provider.UpdatableProvider); ok {
+		if s, ok := p.(P.UpdatableProvider); ok {
 			updatedAt = s.UpdatedAt()
 		}
 

core/src/main/golang/native/tunnel/proxies.go

@@ -6,10 +6,11 @@ import (
 
 	"github.com/dlclark/regexp2"
 
-	"github.com/Dreamacro/clash/adapters/outbound"
-	"github.com/Dreamacro/clash/adapters/outboundgroup"
-	"github.com/Dreamacro/clash/adapters/provider"
+	"github.com/Dreamacro/clash/adapter"
+
+	"github.com/Dreamacro/clash/adapter/outboundgroup"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/constant/provider"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 )
@@ -60,7 +61,7 @@ func QueryProxyGroupNames(excludeNotSelectable bool) []string {
 		return []string{}
 	}
 
-	global := tunnel.Proxies()["GLOBAL"].(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
+	global := tunnel.Proxies()["GLOBAL"].(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
 	proxies := global.Providers()[0].Proxies()
 	result := make([]string, 0, len(proxies)+1)
 
@@ -69,7 +70,7 @@ func QueryProxyGroupNames(excludeNotSelectable bool) []string {
 	}
 
 	for _, p := range proxies {
-		if _, ok := p.(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup); ok {
+		if _, ok := p.(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup); ok {
 			if !excludeNotSelectable || p.Type() == C.Selector {
 				result = append(result, p.Name())
 			}
@@ -88,7 +89,7 @@ func QueryProxyGroup(name string, sortMode SortMode, uiSubtitlePattern *regexp2.
 		return nil
 	}
 
-	g, ok := p.(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
+	g, ok := p.(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
 	if !ok {
 		log.Warnln("Query group `%s`: invalid type %s", name, p.Type().String())
 
@@ -136,7 +137,7 @@ func PatchSelector(selector, name string) bool {
 		return false
 	}
 
-	g, ok := p.(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
+	g, ok := p.(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup)
 	if !ok {
 		log.Warnln("Patch selector `%s`: invalid type %s", selector, p.Type().String())
 
@@ -171,7 +172,7 @@ func collectProviders(providers []provider.ProxyProvider, uiSubtitlePattern *reg
 			subtitle := px.Type().String()
 
 			if uiSubtitlePattern != nil {
-				if _, ok := px.(*outbound.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup); !ok {
+				if _, ok := px.(*adapter.Proxy).ProxyAdapter.(outboundgroup.ProxyGroup); !ok {
 					runes := []rune(name)
 					match, err := uiSubtitlePattern.FindRunesMatch(runes)
 					if err == nil && match != nil {

core/src/main/golang/native/tunnel/suspend.go

@@ -1,6 +1,6 @@
 package tunnel
 
-import "github.com/Dreamacro/clash/adapters/provider"
+import "github.com/Dreamacro/clash/adapter/provider"
 
 func Suspend(s bool) {
 	provider.Suspend(s)

core/src/main/golang/proxy/http.go

@@ -1,108 +0,0 @@
-package proxy
-
-import (
-	"bufio"
-	"net"
-	"net/http"
-	"sync"
-	"time"
-
-	adapters "github.com/Dreamacro/clash/adapters/inbound"
-	"github.com/Dreamacro/clash/log"
-	"github.com/Dreamacro/clash/tunnel"
-)
-
-const (
-	LocalHttpTimeout = time.Millisecond * 100
-)
-
-var listener *httpListener
-var lock sync.Mutex
-
-type httpListener struct {
-	net.Listener
-
-	closed bool
-}
-
-func Start(listen string) (listenAt string, err error) {
-	lock.Lock()
-	defer lock.Unlock()
-
-	stopLocked()
-
-	l, err := net.Listen("tcp", listen)
-	if err != nil {
-		log.Errorln("Listen HTTP proxy at: %s: %s", listen, err.Error())
-
-		return
-	}
-
-	h := &httpListener{
-		Listener: l,
-		closed:   false,
-	}
-
-	listener = h
-
-	go func() {
-		for !h.closed {
-			conn, err := h.Accept()
-			if err != nil {
-				log.Warnln("Accept connection: %s", err.Error())
-				continue
-			}
-
-			_ = conn.(*net.TCPConn).SetKeepAlive(false)
-
-			h.handleConn(conn)
-		}
-	}()
-
-	return h.Addr().String(), nil
-}
-
-func Stop() {
-	lock.Lock()
-	defer lock.Unlock()
-
-	stopLocked()
-}
-
-func stopLocked() {
-	if listener != nil {
-		listener.closed = true
-		_ = listener.Close()
-	}
-
-	listener = nil
-}
-
-func (l *httpListener) handleConn(conn net.Conn) {
-	_ = conn.SetReadDeadline(time.Now().Add(LocalHttpTimeout))
-
-	br := bufio.NewReader(conn)
-	request, err := http.ReadRequest(br)
-
-	_ = conn.SetReadDeadline(time.Time{})
-
-	if err != nil || request.URL.Host == "" {
-		if err != nil {
-			log.Warnln("HTTP Connection closed: %s", err.Error())
-		}
-		
-		_ = conn.Close()
-		return
-	}
-
-	if request.Method == http.MethodConnect {
-		_, err := conn.Write([]byte("HTTP/1.1 200 Connection established\r\n\r\n"))
-		if err != nil {
-			return
-		}
-		tunnel.Add(adapters.NewHTTPS(request, conn))
-		return
-	}
-
-	tunnel.Add(adapters.NewHTTP(request, conn))
-}

core/src/main/java/com/github/kr328/clash/core/Clash.kt

@@ -52,6 +52,10 @@ object Clash {
         Bridge.nativeNotifyDnsChanged(dns.joinToString(separator = ","))
     }
 
+    fun notifyTimeZoneChanged(name: String, offset: Int) {
+        Bridge.nativeNotifyTimeZoneChanged(name, offset)
+    }
+
     fun notifyInstalledAppsChanged(uids: List<Pair<Int, String>>) {
         val uidList = uids.joinToString(separator = ",") { "${it.first}:${it.second}" }
 
@@ -61,12 +65,12 @@ object Clash {
     fun startTun(
         fd: Int,
         mtu: Int,
-        gateway: String,
         dns: String,
+        blocking: String,
         markSocket: (Int) -> Boolean,
         querySocketUid: (protocol: Int, source: InetSocketAddress, target: InetSocketAddress) -> Int
     ) {
-        Bridge.nativeStartTun(fd, mtu, gateway, dns, object : TunInterface {
+        Bridge.nativeStartTun(fd, mtu, dns, blocking, object : TunInterface {
             override fun markSocket(fd: Int) {
                 markSocket(fd)
             }

core/src/main/java/com/github/kr328/clash/core/bridge/Bridge.kt

@@ -16,8 +16,9 @@ object Bridge {
     external fun nativeQueryTrafficNow(): Long
     external fun nativeQueryTrafficTotal(): Long
     external fun nativeNotifyDnsChanged(dnsList: String)
+    external fun nativeNotifyTimeZoneChanged(name: String, offset: Int)
     external fun nativeNotifyInstalledAppChanged(uidList: String)
-    external fun nativeStartTun(fd: Int, mtu: Int, gateway: String, dns: String, cb: TunInterface)
+    external fun nativeStartTun(fd: Int, mtu: Int, dns: String, blocking: String, cb: TunInterface)
     external fun nativeStopTun()
     external fun nativeStartHttp(listenAt: String): String?
     external fun nativeStopHttp()

core/src/main/java/com/github/kr328/clash/core/model/ConfigurationOverride.kt

@@ -91,6 +91,9 @@ data class ConfigurationOverride(
         @SerialName("geoip")
         var geoIp: Boolean? = null,
 
+        @SerialName("geoip-code")
+        var geoIpCode: String? = null,
+
         @SerialName("ipcidr")
         var ipcidr: List<String>? = null,
 

core/src/main/java/com/github/kr328/clash/core/util/Parcelizer.kt

@@ -14,8 +14,7 @@ import kotlinx.serialization.modules.SerializersModule
 
 object Parcelizer {
     private class ParcelDecoder(private val parcel: Parcel) : Decoder, CompositeDecoder {
-        @ExperimentalSerializationApi
-        override val serializersModule: SerializersModule = EmptySerializersModule
+        override val serializersModule: SerializersModule = SerializersModule {}
 
         @ExperimentalSerializationApi
         override fun decodeSequentially(): Boolean = true
@@ -122,8 +121,7 @@ object Parcelizer {
     }
 
     private class ParcelEncoder(private val parcel: Parcel) : Encoder, CompositeEncoder {
-        @ExperimentalSerializationApi
-        override val serializersModule: SerializersModule = EmptySerializersModule
+        override val serializersModule: SerializersModule = SerializersModule {}
 
         override fun encodeBooleanElement(
             descriptor: SerialDescriptor,

core/src/premium/golang/go.mod

@@ -0,0 +1,45 @@
+module premium
+
+go 1.17
+
+require cfa v0.0.0
+
+require (
+	cfa/blob v0.0.0 // indirect
+	github.com/Dreamacro/clash v1.7.1 // indirect
+	github.com/Dreamacro/go-shadowsocks2 v0.1.7 // indirect
+	github.com/avast/apkparser v0.0.0-20210223100516-186f320f9bfc // indirect
+	github.com/avast/apkverifier v0.0.0-20210916093748-2146ff7c4b7f // indirect
+	github.com/dlclark/regexp2 v1.4.0 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/google/btree v1.0.1 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac // indirect
+	github.com/klauspost/compress v1.11.13 // indirect
+	github.com/kr328/tun2socket-lwip v0.0.0-20211015022349-94b5374d46e5 // indirect
+	github.com/miekg/dns v1.1.43 // indirect
+	github.com/oschwald/geoip2-golang v1.5.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.8.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
+	go.etcd.io/bbolt v1.3.5 // indirect
+	go.starlark.net v0.0.0-20210901212718-87f333178d59 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gvisor.dev/gvisor v0.0.0-20210904021812-0d58674c658a // indirect
+	inet.af/netaddr v0.0.0-20210903134321-85fa6c94624e // indirect
+)
+
+replace cfa => ../../main/golang
+
+replace github.com/Dreamacro/clash => ./clash
+
+replace cfa/blob => ../../../build/intermediates/golang_blob

core/src/premium/golang/main.go

@@ -0,0 +1,3 @@
+package main
+
+import _ "cfa/native/all"

design/build.gradle.kts

@@ -1,70 +1,21 @@
 plugins {
-    id("com.android.library")
     kotlin("android")
     kotlin("kapt")
-}
-
-android {
-    compileSdk = buildTargetSdkVersion
-
-    flavorDimensions(buildFlavor)
-
-    defaultConfig {
-        minSdk = buildMinSdkVersion
-        targetSdk = buildTargetSdkVersion
-
-        versionCode = buildVersionCode
-        versionName = buildVersionName
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    productFlavors {
-        create("foss") {
-            dimension = "foss"
-        }
-        create("premium") {
-            dimension = "premium"
-        }
-    }
-
-    buildFeatures {
-        dataBinding = true
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+    id("com.android.library")
 }
 
 dependencies {
-    api(project(":common"))
-    api(project(":core"))
-    api(project(":service"))
+    implementation(project(":common"))
+    implementation(project(":core"))
+    implementation(project(":service"))
 
-    implementation(kotlin("stdlib-jdk7"))
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
-    implementation("androidx.core:core-ktx:$coreVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
-    implementation("androidx.activity:activity:$activityVersion")
-    implementation("com.google.android.material:material:$materialVersion")
-    implementation("androidx.coordinatorlayout:coordinatorlayout:$coordinatorlayoutVersion")
-    implementation("androidx.recyclerview:recyclerview:$recyclerviewVersion")
-    implementation("androidx.fragment:fragment:$fragmentVersion")
-    implementation("androidx.viewpager2:viewpager2:$viewpagerVersion")
+    implementation(deps.kotlin.coroutine)
+    implementation(deps.androidx.core)
+    implementation(deps.androidx.appcompat)
+    implementation(deps.androidx.activity)
+    implementation(deps.androidx.coordinator)
+    implementation(deps.androidx.recyclerview)
+    implementation(deps.androidx.fragment)
+    implementation(deps.androidx.viewpager)
+    implementation(deps.google.material)
 }

design/src/foss/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt

@@ -1,399 +0,0 @@
-package com.github.kr328.clash.design
-
-import android.content.Context
-import android.view.View
-import com.github.kr328.clash.core.model.ConfigurationOverride
-import com.github.kr328.clash.core.model.LogMessage
-import com.github.kr328.clash.core.model.TunnelState
-import com.github.kr328.clash.design.adapter.SideloadProviderAdapter
-import com.github.kr328.clash.design.databinding.DesignSettingsOverideBinding
-import com.github.kr328.clash.design.databinding.DialogPreferenceListBinding
-import com.github.kr328.clash.design.dialog.FullScreenDialog
-import com.github.kr328.clash.design.model.AppInfo
-import com.github.kr328.clash.design.preference.*
-import com.github.kr328.clash.design.util.*
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.resume
-
-class OverrideSettingsDesign(
-    context: Context,
-    configuration: ConfigurationOverride
-) : Design<OverrideSettingsDesign.Request>(context) {
-    enum class Request {
-        ResetOverride, EditSideloadGeoip
-    }
-
-    private val binding = DesignSettingsOverideBinding
-        .inflate(context.layoutInflater, context.root, false)
-
-    override val root: View
-        get() = binding.root
-
-    suspend fun requestResetConfirm(): Boolean {
-        return suspendCancellableCoroutine { ctx ->
-            val dialog = MaterialAlertDialogBuilder(context)
-                .setTitle(R.string.reset_override_settings)
-                .setMessage(R.string.reset_override_settings_message)
-                .setPositiveButton(R.string.ok) { _, _ -> ctx.resume(true) }
-                .setNegativeButton(R.string.cancel) { _, _ -> }
-                .show()
-
-            dialog.setOnDismissListener {
-                if (!ctx.isCompleted)
-                    ctx.resume(false)
-            }
-
-            ctx.invokeOnCancellation {
-                dialog.dismiss()
-            }
-        }
-    }
-
-    suspend fun requestSelectSideload(initial: String, apps: List<AppInfo>): String =
-        withContext(Dispatchers.Main) {
-            suspendCancellableCoroutine { ctx ->
-                val binding = DialogPreferenceListBinding
-                    .inflate(context.layoutInflater, context.root, false)
-                val adapter = SideloadProviderAdapter(context, apps, initial)
-                val dialog = FullScreenDialog(context)
-
-                dialog.setContentView(binding.root)
-
-                binding.surface = dialog.surface
-
-                binding.titleView.text = context.getString(R.string.sideload_geoip)
-
-                binding.newView.visibility = View.INVISIBLE
-
-                binding.mainList.applyLinearAdapter(context, adapter)
-
-                binding.resetView.setOnClickListener {
-                    ctx.resume("")
-
-                    dialog.dismiss()
-                }
-
-                binding.cancelView.setOnClickListener {
-                    dialog.dismiss()
-                }
-
-                binding.okView.setOnClickListener {
-                    ctx.resume(adapter.selectedPackageName)
-
-                    dialog.dismiss()
-                }
-
-                dialog.setOnDismissListener {
-                    if (!ctx.isCompleted)
-                        ctx.resume(initial)
-                }
-
-                dialog.show()
-            }
-        }
-
-    init {
-        binding.self = this
-
-        binding.activityBarLayout.applyFrom(context)
-
-        binding.scrollRoot.bindAppBarElevation(binding.activityBarLayout)
-
-        val booleanValues: Array<Boolean?> = arrayOf(
-            null,
-            true,
-            false
-        )
-        val booleanValuesText: Array<Int> = arrayOf(
-            R.string.dont_modify,
-            R.string.enabled,
-            R.string.disabled
-        )
-
-        val screen = preferenceScreen(context) {
-            category(R.string.general)
-
-            editableText(
-                value = configuration::httpPort,
-                adapter = NullableTextAdapter.Port,
-                title = R.string.http_port,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-            )
-
-            editableText(
-                value = configuration::socksPort,
-                adapter = NullableTextAdapter.Port,
-                title = R.string.socks_port,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-            )
-
-            editableText(
-                value = configuration::redirectPort,
-                adapter = NullableTextAdapter.Port,
-                title = R.string.redirect_port,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-            )
-
-            editableText(
-                value = configuration::tproxyPort,
-                adapter = NullableTextAdapter.Port,
-                title = R.string.tproxy_port,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-            )
-
-            editableText(
-                value = configuration::mixedPort,
-                adapter = NullableTextAdapter.Port,
-                title = R.string.mixed_port,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-            )
-
-            editableTextList(
-                value = configuration::authentication,
-                adapter = TextAdapter.String,
-                title = R.string.authentication,
-                placeholder = R.string.dont_modify,
-            )
-
-            selectableList(
-                value = configuration::allowLan,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.allow_lan,
-            )
-
-            selectableList(
-                value = configuration::ipv6,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.ipv6,
-            )
-
-            editableText(
-                value = configuration::bindAddress,
-                adapter = NullableTextAdapter.String,
-                title = R.string.bind_address,
-                placeholder = R.string.dont_modify,
-                empty = R.string.default_
-            )
-
-            selectableList(
-                value = configuration::mode,
-                values = arrayOf(
-                    null,
-                    TunnelState.Mode.Direct,
-                    TunnelState.Mode.Global,
-                    TunnelState.Mode.Rule,
-                ),
-                valuesText = arrayOf(
-                    R.string.dont_modify,
-                    R.string.direct_mode,
-                    R.string.global_mode,
-                    R.string.rule_mode,
-                ),
-                title = R.string.mode
-            )
-
-            selectableList(
-                value = configuration::logLevel,
-                values = arrayOf(
-                    null,
-                    LogMessage.Level.Info,
-                    LogMessage.Level.Warning,
-                    LogMessage.Level.Error,
-                    LogMessage.Level.Debug,
-                    LogMessage.Level.Silent,
-                ),
-                valuesText = arrayOf(
-                    R.string.dont_modify,
-                    R.string.info,
-                    R.string.warning,
-                    R.string.error,
-                    R.string.debug,
-                    R.string.silent,
-                ),
-                title = R.string.log_level,
-            )
-
-            editableTextMap(
-                value = configuration::hosts,
-                keyAdapter = TextAdapter.String,
-                valueAdapter = TextAdapter.String,
-                title = R.string.hosts,
-                placeholder = R.string.dont_modify,
-            )
-
-            clickable(
-                title = R.string.sideload_geoip,
-                summary = R.string.sideload_geoip_summary
-            ) {
-                clicked {
-                    requests.trySend(Request.EditSideloadGeoip)
-                }
-            }
-
-            category(R.string.dns)
-
-            val dnsDependencies: MutableList<Preference> = mutableListOf()
-
-            val dns = selectableList(
-                value = configuration.dns::enable,
-                values = arrayOf(
-                    null,
-                    true,
-                    false
-                ),
-                valuesText = arrayOf(
-                    R.string.dont_modify,
-                    R.string.force_enable,
-                    R.string.use_built_in,
-                ),
-                title = R.string.strategy
-            ) {
-                listener = OnChangedListener {
-                    if (configuration.dns.enable == false) {
-                        dnsDependencies.forEach {
-                            it.enabled = false
-                        }
-                    } else {
-                        dnsDependencies.forEach {
-                            it.enabled = true
-                        }
-                    }
-                }
-            }
-
-            editableText(
-                value = configuration.dns::listen,
-                adapter = NullableTextAdapter.String,
-                title = R.string.listen,
-                placeholder = R.string.dont_modify,
-                empty = R.string.disabled,
-                configure = dnsDependencies::add,
-            )
-
-            selectableList(
-                value = configuration.app::appendSystemDns,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.append_system_dns,
-                configure = dnsDependencies::add,
-            )
-
-            selectableList(
-                value = configuration.dns::ipv6,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.ipv6,
-                configure = dnsDependencies::add,
-            )
-
-            selectableList(
-                value = configuration.dns::useHosts,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.use_hosts,
-                configure = dnsDependencies::add,
-            )
-
-            selectableList(
-                value = configuration.dns::enhancedMode,
-                values = arrayOf(
-                    null,
-                    ConfigurationOverride.DnsEnhancedMode.None,
-                    ConfigurationOverride.DnsEnhancedMode.FakeIp,
-                    ConfigurationOverride.DnsEnhancedMode.Mapping
-                ),
-                valuesText = arrayOf(
-                    R.string.dont_modify,
-                    R.string.disabled,
-                    R.string.fakeip,
-                    R.string.mapping
-                ),
-                title = R.string.enhanced_mode,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns::nameServer,
-                adapter = TextAdapter.String,
-                title = R.string.name_server,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns::fallback,
-                adapter = TextAdapter.String,
-                title = R.string.fallback,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns::defaultServer,
-                adapter = TextAdapter.String,
-                title = R.string.default_name_server,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns::fakeIpFilter,
-                adapter = TextAdapter.String,
-                title = R.string.fakeip_filter,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            selectableList(
-                value = configuration.dns.fallbackFilter::geoIp,
-                values = booleanValues,
-                valuesText = booleanValuesText,
-                title = R.string.geoip_fallback,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns.fallbackFilter::domain,
-                adapter = TextAdapter.String,
-                title = R.string.domain_fallback,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextList(
-                value = configuration.dns.fallbackFilter::ipcidr,
-                adapter = TextAdapter.String,
-                title = R.string.ipcidr_fallback,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            editableTextMap(
-                value = configuration.dns::nameserverPolicy,
-                keyAdapter = TextAdapter.String,
-                valueAdapter = TextAdapter.String,
-                title = R.string.name_server_policy,
-                placeholder = R.string.dont_modify,
-                configure = dnsDependencies::add,
-            )
-
-            dns.listener?.onChanged()
-        }
-
-        binding.content.addView(screen.root)
-    }
-
-    fun requestClear() {
-        requests.trySend(Request.ResetOverride)
-    }
-}

design/src/foss/java/com/github/kr328/clash/design/component/ProxyMenu.kt

@@ -1,113 +0,0 @@
-package com.github.kr328.clash.design.component
-
-import android.content.Context
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.widget.PopupMenu
-import com.github.kr328.clash.core.model.ProxySort
-import com.github.kr328.clash.core.model.TunnelState
-import com.github.kr328.clash.design.ProxyDesign
-import com.github.kr328.clash.design.R
-import com.github.kr328.clash.design.store.UiStore
-import kotlinx.coroutines.channels.Channel
-
-class ProxyMenu(
-    context: Context,
-    menuView: View,
-    mode: TunnelState.Mode?,
-    private val uiStore: UiStore,
-    private val requests: Channel<ProxyDesign.Request>,
-    private val updateConfig: () -> Unit,
-) : PopupMenu.OnMenuItemClickListener {
-    private val menu = PopupMenu(context, menuView)
-
-    fun show() {
-        menu.show()
-    }
-
-    override fun onMenuItemClick(item: MenuItem): Boolean {
-        item.isChecked = !item.isChecked
-
-        when (item.itemId) {
-            R.id.not_selectable -> {
-                uiStore.proxyExcludeNotSelectable = item.isChecked
-
-                requests.trySend(ProxyDesign.Request.ReLaunch)
-            }
-            R.id.single -> {
-                uiStore.proxySingleLine = true
-
-                updateConfig()
-
-                requests.trySend(ProxyDesign.Request.ReloadAll)
-            }
-            R.id.multiple -> {
-                uiStore.proxySingleLine = false
-
-                updateConfig()
-
-                requests.trySend(ProxyDesign.Request.ReloadAll)
-            }
-            R.id.default_ -> {
-                uiStore.proxySort = ProxySort.Default
-
-                requests.trySend(ProxyDesign.Request.ReloadAll)
-            }
-            R.id.name -> {
-                uiStore.proxySort = ProxySort.Title
-
-                requests.trySend(ProxyDesign.Request.ReloadAll)
-            }
-            R.id.delay -> {
-                uiStore.proxySort = ProxySort.Delay
-
-                requests.trySend(ProxyDesign.Request.ReloadAll)
-            }
-            R.id.dont_modify -> {
-                requests.trySend(ProxyDesign.Request.PatchMode(null))
-            }
-            R.id.direct_mode -> {
-                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Direct))
-            }
-            R.id.global_mode -> {
-                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Global))
-            }
-            R.id.rule_mode -> {
-                requests.trySend(ProxyDesign.Request.PatchMode(TunnelState.Mode.Rule))
-            }
-            else -> return false
-        }
-
-        return true
-    }
-
-    init {
-        menu.menuInflater.inflate(R.menu.menu_proxy, menu.menu)
-
-        menu.menu.apply {
-            findItem(R.id.not_selectable).isChecked = uiStore.proxyExcludeNotSelectable
-
-            if (uiStore.proxySingleLine) {
-                findItem(R.id.single).isChecked = true
-            } else {
-                findItem(R.id.multiple).isChecked = true
-            }
-
-            when (uiStore.proxySort) {
-                ProxySort.Default -> findItem(R.id.default_).isChecked = true
-                ProxySort.Title -> findItem(R.id.name).isChecked = true
-                ProxySort.Delay -> findItem(R.id.delay).isChecked = true
-            }
-
-            when (mode) {
-                null -> findItem(R.id.dont_modify).isChecked = true
-                TunnelState.Mode.Direct -> findItem(R.id.direct_mode).isChecked = true
-                TunnelState.Mode.Global -> findItem(R.id.global_mode).isChecked = true
-                TunnelState.Mode.Rule -> findItem(R.id.rule_mode).isChecked = true
-                TunnelState.Mode.Script -> throw IllegalStateException("invalid mode")
-            }
-        }
-
-        menu.setOnMenuItemClickListener(this)
-    }
-}

design/src/foss/res/menu/menu_proxy.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/filter">
-        <menu>
-            <item
-                android:id="@+id/not_selectable"
-                android:checkable="true"
-                android:title="@string/not_selectable" />
-        </menu>
-    </item>
-    <item android:title="@string/mode">
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/dont_modify"
-                    android:title="@string/dont_modify" />
-                <item
-                    android:id="@+id/direct_mode"
-                    android:title="@string/direct_mode" />
-                <item
-                    android:id="@+id/global_mode"
-                    android:title="@string/global_mode" />
-                <item
-                    android:id="@+id/rule_mode"
-                    android:title="@string/rule_mode" />
-            </group>
-        </menu>
-    </item>
-    <item android:title="@string/layout">
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/single"
-                    android:title="@string/single" />
-                <item
-                    android:id="@+id/multiple"
-                    android:title="@string/multiple" />
-            </group>
-        </menu>
-    </item>
-    <item android:title="@string/sort">
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/default_"
-                    android:title="@string/default_" />
-                <item
-                    android:id="@+id/name"
-                    android:title="@string/name" />
-                <item
-                    android:id="@+id/delay"
-                    android:title="@string/delay" />
-            </group>
-        </menu>
-    </item>
-</menu>

design/src/main/java/com/github/kr328/clash/design/HelpDesign.kt

@@ -47,6 +47,17 @@ class HelpDesign(
 
             category(R.string.feedback)
 
+            if (BuildConfig.PREMIUM) {
+                clickable(
+                    title = R.string.google_play,
+                    summary = R.string.google_play_url
+                ) {
+                    clicked {
+                        openLink(Uri.parse(context.getString(R.string.google_play_url)))
+                    }
+                }
+            }
+
             clickable(
                 title = R.string.github_issues,
                 summary = R.string.github_issues_url
@@ -56,23 +67,25 @@ class HelpDesign(
                 }
             }
 
-            category(R.string.sources)
+            if (!BuildConfig.PREMIUM) {
+                category(R.string.sources)
 
-            clickable(
-                title = R.string.clash_for_android,
-                summary = R.string.github_url
-            ) {
-                clicked {
-                    openLink(Uri.parse(context.getString(R.string.github_url)))
+                clickable(
+                    title = R.string.clash_for_android,
+                    summary = R.string.github_url
+                ) {
+                    clicked {
+                        openLink(Uri.parse(context.getString(R.string.github_url)))
+                    }
                 }
-            }
 
-            clickable(
-                title = R.string.clash_core,
-                summary = R.string.clash_core_url
-            ) {
-                clicked {
-                    openLink(Uri.parse(context.getString(R.string.clash_core_url)))
+                clickable(
+                    title = R.string.clash_core,
+                    summary = R.string.clash_core_url
+                ) {
+                    clicked {
+                        openLink(Uri.parse(context.getString(R.string.clash_core_url)))
+                    }
                 }
             }
 

design/src/main/java/com/github/kr328/clash/design/NetworkSettingsDesign.kt

@@ -70,6 +70,13 @@ class NetworkSettingsDesign(
                 configure = vpnDependencies::add,
             )
 
+            switch(
+                value = srvStore::blockLoopback,
+                title = R.string.block_loopback,
+                summary = R.string.block_loopback_summary,
+                configure = vpnDependencies::add,
+            )
+
             if (Build.VERSION.SDK_INT >= 29) {
                 switch(
                     value = srvStore::systemProxy,

design/src/main/java/com/github/kr328/clash/design/OverrideSettingsDesign.kt

@@ -185,24 +185,43 @@ class OverrideSettingsDesign(
                 empty = R.string.default_
             )
 
-            selectableList(
-                value = configuration::mode,
-                values = arrayOf(
-                    null,
-                    TunnelState.Mode.Direct,
-                    TunnelState.Mode.Global,
-                    TunnelState.Mode.Rule,
-                    TunnelState.Mode.Script
-                ),
-                valuesText = arrayOf(
-                    R.string.dont_modify,
-                    R.string.direct_mode,
-                    R.string.global_mode,
-                    R.string.rule_mode,
-                    R.string.script_mode
-                ),
-                title = R.string.mode
-            )
+            if (BuildConfig.PREMIUM) {
+                selectableList(
+                    value = configuration::mode,
+                    values = arrayOf(
+                        null,
+                        TunnelState.Mode.Direct,
+                        TunnelState.Mode.Global,
+                        TunnelState.Mode.Rule,
+                        TunnelState.Mode.Script
+                    ),
+                    valuesText = arrayOf(
+                        R.string.dont_modify,
+                        R.string.direct_mode,
+                        R.string.global_mode,
+                        R.string.rule_mode,
+                        R.string.script_mode
+                    ),
+                    title = R.string.mode
+                )
+            } else {
+                selectableList(
+                    value = configuration::mode,
+                    values = arrayOf(
+                        null,
+                        TunnelState.Mode.Direct,
+                        TunnelState.Mode.Global,
+                        TunnelState.Mode.Rule
+                    ),
+                    valuesText = arrayOf(
+                        R.string.dont_modify,
+                        R.string.direct_mode,
+                        R.string.global_mode,
+                        R.string.rule_mode
+                    ),
+                    title = R.string.mode
+                )
+            }
 
             selectableList(
                 value = configuration::logLevel,
@@ -364,6 +383,15 @@ class OverrideSettingsDesign(
                 configure = dnsDependencies::add,
             )
 
+            editableText(
+                value = configuration.dns.fallbackFilter::geoIpCode,
+                adapter = NullableTextAdapter.String,
+                title = R.string.geoip_fallback_code,
+                placeholder = R.string.dont_modify,
+                empty = R.string.raw_cn,
+                configure = dnsDependencies::add,
+            )
+
             editableTextList(
                 value = configuration.dns.fallbackFilter::domain,
                 adapter = TextAdapter.String,

design/src/main/java/com/github/kr328/clash/design/component/ProxyMenu.kt

@@ -6,6 +6,7 @@ import android.view.View
 import androidx.appcompat.widget.PopupMenu
 import com.github.kr328.clash.core.model.ProxySort
 import com.github.kr328.clash.core.model.TunnelState
+import com.github.kr328.clash.design.BuildConfig
 import com.github.kr328.clash.design.ProxyDesign
 import com.github.kr328.clash.design.R
 import com.github.kr328.clash.design.store.UiStore
@@ -88,6 +89,8 @@ class ProxyMenu(
         menu.menuInflater.inflate(R.menu.menu_proxy, menu.menu)
 
         menu.menu.apply {
+            findItem(R.id.script_mode).isVisible = BuildConfig.PREMIUM
+
             findItem(R.id.not_selectable).isChecked = uiStore.proxyExcludeNotSelectable
 
             if (uiStore.proxySingleLine) {

design/src/main/res/values-zh-rHK/strings.xml

@@ -211,4 +211,6 @@
     <string name="sources">源代碼</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
+    <string name="block_loopback">阻止本地迴環</string>
+    <string name="block_loopback_summary">阻止本地迴環連接</string>
 </resources>

design/src/main/res/values-zh-rTW/strings.xml

@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="access_control_packages_summary">為應用配置訪問權限</string>
+    <string name="access_control_packages_summary">為軟體設定訪問權限</string>
     <string name="about">關於</string>
     <string name="access_control_mode">訪問控制模式</string>
-    <string name="access_control_packages">訪問控制應用包列表</string>
-    <string name="append_system_dns">追加系統 DNS</string>
-    <string name="application_broken">應用損壞</string>
+    <string name="access_control_packages">訪問控制軟體套件清單</string>
+    <string name="append_system_dns">追加作業系統 DNS</string>
+    <string name="application_broken">軟體損毀</string>
     <string name="application_name">Clash for Android</string>
     <string name="auto_update">自動更新</string>
     <string name="behavior">行為</string>
-    <string name="bypass_private_network">繞過私有網絡</string>
-    <string name="bypass_private_network_summary">繞過私有網絡地址</string>
+    <string name="bypass_private_network">繞過私有網路</string>
+    <string name="bypass_private_network_summary">繞過私有網路位址</string>
     <string name="cancel">取消</string>
-    <string name="clash_logcat">Clash 日誌捕捉工具</string>
-    <string name="create_profile">創建配置</string>
-    <string name="dark_mode">暗黑模式</string>
-    <string name="default_">默認</string>
-    <string name="delay">延遲</string>
+    <string name="clash_logcat">Clash 日誌檔採集工具</string>
+    <string name="create_profile">建立設定檔</string>
+    <string name="dark_mode">深色模式</string>
+    <string name="default_">預設</string>
+    <string name="delay">延時</string>
     <string name="delete">刪除</string>
-    <string name="delete_all_logs">刪除所有日誌</string>
-    <string name="delete_all_logs_warn">所有歷史日誌將丟失</string>
-    <string name="detail">詳情</string>
+    <string name="delete_all_logs">刪除所有日誌檔</string>
+    <string name="delete_all_logs_warn">所有歷史日誌檔將丟失</string>
+    <string name="detail">內容</string>
     <string name="direct_mode">直連模式</string>
     <string name="disabled">已禁用</string>
     <string name="dns_hijacking">DNS 劫持</string>
-    <string name="dns_hijacking_summary">處理所有 DNS 數據包</string>
+    <string name="dns_hijacking_summary">處理所有 DNS 封包</string>
     <string name="duplicate">複製</string>
     <string name="edit">編輯</string>
-    <string name="empty_name">空名稱</string>
-    <string name="exit_without_save">退出而不保存</string>
+    <string name="empty_name">空白名稱</string>
+    <string name="exit_without_save">退出而不儲存</string>
     <string name="exit_without_save_warning">所有變更將會丟失</string>
-    <string name="export">導出</string>
+    <string name="export">匯出</string>
     <string name="external">外部</string>
-    <string name="file">文件</string>
-    <string name="file_exported">文件已導出</string>
+    <string name="file">檔案</string>
+    <string name="file_exported">檔案已匯出</string>
     <string name="format_minutes">%d 分鐘</string>
-    <string name="format_profile_activated">%s 已激活</string>
+    <string name="format_profile_activated">%s 已啟用</string>
     <string name="format_traffic_forwarded">%s 已轉發</string>
-    <string name="global_mode">全局模式</string>
+    <string name="global_mode">全域性模式</string>
     <string name="history">歷史</string>
-    <string name="import_from_file">從文件導入</string>
-    <string name="import_from_url">從 URL 導入</string>
-    <string name="interface_">界面</string>
-    <string name="invalid_url">無效的 URL</string>
+    <string name="import_from_file">從檔案匯入</string>
+    <string name="import_from_url">從 URL 匯入</string>
+    <string name="interface_">介面</string>
+    <string name="invalid_url">無效 URL</string>
     <string name="launch_name">Clash</string>
     <string name="logcat">Logcat</string>
     <string name="logs">日誌</string>
     <string name="mode">模式</string>
     <string name="name">名稱</string>
-    <string name="network">網絡</string>
-    <string name="new_profile">新配置</string>
-    <string name="not_selected">未選擇</string>
+    <string name="network">網路</string>
+    <string name="new_profile">新設定檔</string>
+    <string name="not_selected">未選取</string>
     <string name="ok">確認</string>
-    <string name="profile">配置</string>
-    <string name="profile_name">配置名稱</string>
-    <string name="profiles">配置</string>
+    <string name="profile">設定檔</string>
+    <string name="profile_name">設定檔名稱</string>
+    <string name="profiles">設定檔</string>
     <string name="properties">參數</string>
-    <string name="proxy">代理</string>
-    <string name="recently">近期</string>
-    <string name="route_system_traffic">自動路由系統流量</string>
-    <string name="routing_via_vpn_service">通過 VpnService 自動路由所有系統流量</string>
+    <string name="proxy">Proxy</string>
+    <string name="recently">最近</string>
+    <string name="route_system_traffic">自動轉發作業系統流量</string>
+    <string name="routing_via_vpn_service">通過 VpnService 自動轉發所有作業系統流量</string>
     <string name="rule_mode">規則模式</string>
-    <string name="running">運行中</string>
-    <string name="settings">設置</string>
+    <string name="running">運作中</string>
+    <string name="settings">設定</string>
     <string name="show_traffic">顯示流量</string>
-    <string name="show_traffic_summary">在通知中自動刷新流量</string>
-    <string name="allow_clash_auto_restart">允許 Clash 自動重啟</string>
-    <string name="auto_restart">自動重啟</string>
+    <string name="show_traffic_summary">在通知中自動重新整理流量</string>
+    <string name="allow_clash_auto_restart">允許 Clash 自動重新啟動</string>
+    <string name="auto_restart">自動重新啟動</string>
     <string name="stopped">已停止</string>
     <string name="help">幫助</string>
     <string name="tap_to_start">點此啟動</string>
     <string name="update">更新</string>
     <string name="url">URL</string>
     <string name="vpn_service_options">VpnService 選項</string>
-    <string name="options_unavailable">選項在 Clash 運行時不可用</string>
-    <string name="search">查找</string>
-    <string name="system_apps">系統應用</string>
+    <string name="options_unavailable">選項在 Clash 運作時不可用</string>
+    <string name="search">尋找</string>
+    <string name="system_apps">作業系統軟體</string>
     <string name="update_time">更新時間</string>
-    <string name="package_name">應用包名稱</string>
+    <string name="package_name">軟體套件名稱</string>
     <string name="install_time">安裝時間</string>
     <string name="clash_for_android">Clash for Android</string>
-    <string name="feedback">反饋</string>
+    <string name="feedback">回饋</string>
     <string name="github_issues">Github Issues</string>
-    <string name="tips_properties"><![CDATA[僅接受 <strong>Clash 配置文件</strong>(包含<strong>代理</strong>/<strong>規則</strong>)]]></string>
+    <string name="tips_properties"><![CDATA[僅接受 <strong>Clash 設定檔</strong>(包含<strong>Proxy</strong>/<strong>規則</strong>)]]></string>
     <string name="loading">載入中</string>
-    <string name="tips_help"><![CDATA[Clash for Android 是一個<strong>免費軟件</strong>並且我們<strong>不</strong>為其提供任何服務, <strong>請務必不要反饋非應用自身引起的問題</strong>]]></string>
-    <string name="donate">捐贈</string>
-    <string name="allow_all_apps">允許所有應用</string>
-    <string name="allow_selected_apps">僅允許已選擇的應用</string>
-    <string name="deny_selected_apps">不允許已選擇的應用</string>
-    <string name="no_profile_selected">沒有選擇配置文件</string>
+    <string name="tips_help"><![CDATA[Clash for Android 是一個<strong>免費軟體</strong>並且我們<strong>不</strong>為其提供任何服務, <strong>請務必不要回報非軟體自身引起的問題</strong>]]></string>
+    <string name="donate">抖內</string>
+    <string name="allow_all_apps">允許所有軟體</string>
+    <string name="allow_selected_apps">僅允許已選取的軟體</string>
+    <string name="deny_selected_apps">不允許已選取的軟體</string>
+    <string name="no_profile_selected">沒有選取設定檔</string>
     <string name="copied">已複製</string>
     <string name="script_mode">腳本模式</string>
     <string name="google_play">Google Play</string>
@@ -97,22 +97,22 @@
     <string name="select_all">全選</string>
     <string name="select_invert">反選</string>
     <string name="select_none">清除</string>
-    <string name="app">應用</string>
-    <string name="follow_system_android_10">跟隨系統 (Android 10+)</string>
-    <string name="always_dark">總是暗黑模式</string>
-    <string name="always_light">總是明亮模式</string>
+    <string name="app">軟體</string>
+    <string name="follow_system_android_10">跟隨作業系統 (Android 10+)</string>
+    <string name="always_dark">總是深色模式</string>
+    <string name="always_light">總是淺色模式</string>
     <string name="service">服務</string>
     <string name="accept_http_content">僅接受 http(s) 和 content 類型</string>
     <string name="at_least_15_minutes">至少 15 分鐘</string>
     <string name="override">覆寫</string>
-    <string name="general">常規</string>
+    <string name="general">一般</string>
     <string name="dns">DNS</string>
-    <string name="http_port">HTTP 端口</string>
-    <string name="socks_port">Socks 端口</string>
-    <string name="mixed_port">複合端口</string>
-    <string name="allow_lan">允許來自局域網的連接</string>
-    <string name="bind_address">監聽地址</string>
-    <string name="log_level">日誌級別</string>
+    <string name="http_port">HTTP 埠</string>
+    <string name="socks_port">Socks 埠</string>
+    <string name="mixed_port">複合埠</string>
+    <string name="allow_lan">允許來自區域網路的連結</string>
+    <string name="bind_address">監聽位址</string>
+    <string name="log_level">日誌檔級別</string>
     <string name="ipv6">IPv6</string>
     <string name="hosts">Hosts</string>
     <string name="enabled">已啟用</string>
@@ -130,85 +130,87 @@
     <string name="fakeip_filter">FakeIP 過濾器</string>
     <string name="geoip_fallback">GeoIP Fallback</string>
     <string name="ipcidr_fallback">IPCIDR Fallback</string>
-    <string name="use_built_in">使用內置</string>
+    <string name="use_built_in">使用內建</string>
     <string name="mapping">Real-IP 至 域名映射</string>
     <string name="fakeip">Fake-IP 至 域名映射</string>
     <string name="sort">排序</string>
     <string name="layout">佈局</string>
-    <string name="single">單列</string>
-    <string name="multiple">多列</string>
-    <string name="not_selectable">不可選擇</string>
+    <string name="single">單欄</string>
+    <string name="multiple">多欄</string>
+    <string name="not_selectable">不可選取</string>
     <string name="providers">外部資源</string>
     <string name="unavailable">不可用</string>
-    <string name="_new">新建</string>
+    <string name="_new">新增</string>
     <string name="value">值</string>
     <string name="listen">監聽</string>
-    <string name="files">文件</string>
-    <string name="browse_files">瀏覽文件</string>
-    <string name="browse_configuration_providers">瀏覽配置文件和外部資源</string>
-    <string name="rename">重命名</string>
-    <string name="file_name">文件名</string>
-    <string name="format_type_unsaved">%s (未保存)</string>
+    <string name="files">檔案</string>
+    <string name="browse_files">瀏覽檔案</string>
+    <string name="browse_configuration_providers">瀏覽設定檔和外部資源</string>
+    <string name="rename">重新命名</string>
+    <string name="file_name">檔名</string>
+    <string name="format_type_unsaved">%s (未儲存)</string>
     <string name="format_minutes_ago">%d 分鐘前</string>
     <string name="format_hours_ago">%d 小時前</string>
     <string name="format_days_ago">%d 天前</string>
     <string name="format_months_ago">%d 月前</string>
     <string name="format_years_ago">%d 年前</string>
-    <string name="system_proxy">系統代理</string>
-    <string name="system_proxy_summary">為 VpnService 附加 HTTP 代理</string>
+    <string name="system_proxy">作業系統 Proxy</string>
+    <string name="system_proxy_summary">為 VpnService 附加 HTTP Proxy</string>
     <string name="dont_modify">不修改</string>
-    <string name="redirect_port">Redirect 端口</string>
-    <string name="tproxy_port">TProxy 端口</string>
-    <string name="reset">重置</string>
+    <string name="redirect_port">Redirect 埠</string>
+    <string name="tproxy_port">TProxy 埠</string>
+    <string name="reset">重設</string>
     <string name="use_hosts">使用 Hosts</string>
     <string name="authentication">認證</string>
     <string name="domain_fallback">域名 Fallback</string>
     <string name="empty">置空</string>
-    <string name="import_from_clipboard">從剪切板導入</string>
-    <string name="export_to_clipboard">導出至剪切板</string>
+    <string name="import_from_clipboard">從剪貼簿匯入</string>
+    <string name="export_to_clipboard">匯出至剪貼簿</string>
     <string name="auto_update_minutes">自動更新 (分鐘)</string>
-    <string name="profile_url">配置 URL</string>
+    <string name="profile_url">設定檔 URL</string>
     <string name="should_not_be_blank">不能為空</string>
-    <string name="format_fetching_configuration">正在從 %s 下載配置文件</string>
+    <string name="format_fetching_configuration">正在從 %s 下載設定檔</string>
     <string name="format_fetching_provider">正在下載外部資源 %s</string>
     <string name="initializing">正在初始化</string>
     <string name="verifying">正在校驗</string>
-    <string name="sideload_geoip">旁加載 GEOIP</string>
-    <string name="sideload_geoip_summary">外部 GEOIP 數據庫</string>
+    <string name="sideload_geoip">旁載入 GEOIP</string>
+    <string name="sideload_geoip_summary">外部 GEOIP 資料庫</string>
     <string name="force_enable">強制啟用</string>
-    <string name="document">文檔</string>
+    <string name="document">文件</string>
     <string name="clash_wiki">Clash Wiki</string>
-    <string name="invalid_file_name">非法的文件名稱</string>
-    <string name="reset_override_settings">重置覆寫設置</string>
-    <string name="reset_override_settings_message">所有的覆寫設置將會被擦除</string>
+    <string name="invalid_file_name">不規範檔案名稱</string>
+    <string name="reset_override_settings">重置覆寫設定</string>
+    <string name="reset_override_settings_message">所有的覆寫設定將會被抹除</string>
     <string name="key">鍵</string>
     <string name="more">更多</string>
-    <string name="save">保存</string>
-    <string name="delay_test">延遲測試</string>
+    <string name="save">儲存</string>
+    <string name="delay_test">延時測試</string>
     <string name="format_provider_type">%1$s(%2$s)</string>
     <string name="rule">規則</string>
     <string name="http">HTTP</string>
-    <string name="compatible">兼容</string>
+    <string name="compatible">相容</string>
     <string name="format_update_provider_failure">更新 %1$s: %2$s</string>
     <string name="update_all">更新全部</string>
-    <string name="proxy_empty_tips">沒有可以顯示的組</string>
+    <string name="proxy_empty_tips">沒有可以顯示的分組</string>
     <string name="reverse">反轉</string>
     <string name="close">關閉</string>
-    <string name="keyword">關鍵詞</string>
-    <string name="invalid_log_file">無效的日誌文件</string>
-    <string name="application_crashed">應用崩潰</string>
-    <string name="application_broken_tips">應用缺少必要的運行組件，這通常由於下載不完整的 apk 導致。</string>
+    <string name="keyword">關鍵字</string>
+    <string name="invalid_log_file">無效的日誌檔</string>
+    <string name="application_crashed">軟體崩潰</string>
+    <string name="application_broken_tips">軟體缺少必要的運作元件，這通常是由於下載了不完整的 apk 而導致。</string>
     <string name="reinstall">重新安裝</string>
     <string name="github_releases">Github Releases</string>
-    <string name="unable_to_start_vpn">無法啟動 VPN 組件</string>
-    <string name="request_donate_tips">如果您覺得本應用對您有幫助歡迎在 [幫助] 中給予開發者一點捐贈</string>
-    <string name="request_donate">捐贈</string>
-    <string name="version_updated">應用已更新</string>
-    <string name="version_updated_tips">設置已被清除，舊的配置文件需要再次保存。</string>
-    <string name="active_unsaved_tips">配置文件需要在激活之前保存</string>
-    <string name="mode_switch_tips">僅在本次會話中有效</string>
-    <string name="import_">導入</string>
-    <string name="sources">源代碼</string>
+    <string name="unable_to_start_vpn">無法啟動 VPN 元件</string>
+    <string name="request_donate_tips">如果您覺得本軟體對您有幫助歡迎在 [幫助] 中給予開發者一點抖內</string>
+    <string name="request_donate">抖內</string>
+    <string name="version_updated">軟體已更新</string>
+    <string name="version_updated_tips">設定已被清除，舊版設定檔需要再次儲存。</string>
+    <string name="active_unsaved_tips">設定檔需要在啟用之前儲存</string>
+    <string name="mode_switch_tips">僅在本次工作階段中有效</string>
+    <string name="import_">匯入</string>
+    <string name="sources">原始碼</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
-</resources>
+    <string name="block_loopback">阻止本地迴環</string>
+    <string name="block_loopback_summary">阻止本地迴環連結</string>
+</resources>

design/src/main/res/values-zh/strings.xml

@@ -211,4 +211,7 @@
     <string name="sources">源代码</string>
     <string name="clash_core">Clash 核心</string>
     <string name="name_server_policy">Name Server 策略</string>
+    <string name="block_loopback">阻止本地回环</string>
+    <string name="block_loopback_summary">阻止本地回环连接</string>
+    <string name="geoip_fallback_code">GeoIP Fallback 区域代码</string>
 </resources>