diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt index b9bc150..263898c 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt @@ -1,7 +1,11 @@ package io.nekohasekai.sagernet.fmt import android.widget.Toast -import io.nekohasekai.sagernet.* +import io.nekohasekai.sagernet.IPv6Mode +import io.nekohasekai.sagernet.Key +import io.nekohasekai.sagernet.R +import io.nekohasekai.sagernet.SagerNet +import io.nekohasekai.sagernet.TunImplementation import io.nekohasekai.sagernet.bg.VpnService import io.nekohasekai.sagernet.database.DataStore import io.nekohasekai.sagernet.database.ProxyEntity @@ -26,8 +30,30 @@ import io.nekohasekai.sagernet.fmt.wireguard.buildSingBoxOutboundWireguardBean import io.nekohasekai.sagernet.ktx.isIpAddress import io.nekohasekai.sagernet.ktx.mkPort import io.nekohasekai.sagernet.utils.PackageCache -import moe.matsuri.nb4a.* -import moe.matsuri.nb4a.SingBoxOptions.* +import moe.matsuri.nb4a.Protocols +import moe.matsuri.nb4a.SingBoxOptions.CacheFile +import moe.matsuri.nb4a.SingBoxOptions.ClashAPIOptions +import moe.matsuri.nb4a.SingBoxOptions.DNSFakeIPOptions +import moe.matsuri.nb4a.SingBoxOptions.DNSOptions +import moe.matsuri.nb4a.SingBoxOptions.DNSRule_DefaultOptions +import moe.matsuri.nb4a.SingBoxOptions.DNSServerOptions +import moe.matsuri.nb4a.SingBoxOptions.ExperimentalOptions +import moe.matsuri.nb4a.SingBoxOptions.Inbound_DirectOptions +import moe.matsuri.nb4a.SingBoxOptions.Inbound_MixedOptions +import moe.matsuri.nb4a.SingBoxOptions.Inbound_TunOptions +import moe.matsuri.nb4a.SingBoxOptions.LogOptions +import moe.matsuri.nb4a.SingBoxOptions.MultiplexOptions +import moe.matsuri.nb4a.SingBoxOptions.MyOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound +import moe.matsuri.nb4a.SingBoxOptions.Outbound_SelectorOptions +import moe.matsuri.nb4a.SingBoxOptions.Outbound_SocksOptions +import moe.matsuri.nb4a.SingBoxOptions.RouteOptions +import moe.matsuri.nb4a.SingBoxOptions.RuleSet +import moe.matsuri.nb4a.SingBoxOptions.Rule_DefaultOptions +import moe.matsuri.nb4a.SingBoxOptionsUtil +import moe.matsuri.nb4a.checkEmpty +import moe.matsuri.nb4a.generateRuleSet +import moe.matsuri.nb4a.makeSingBoxRule import moe.matsuri.nb4a.plugin.Plugins import moe.matsuri.nb4a.proxy.config.ConfigBean import moe.matsuri.nb4a.proxy.shadowtls.ShadowTLSBean @@ -392,7 +418,7 @@ fun buildConfig( protocol = when (DataStore.muxType) { 1 -> "smux" 2 -> "yamux" - else -> "h2mux" + else -> "smux" } }.asMap() }