Fixes

SagerNet · Jan 16, 2022 · 961ec18 · 961ec18
1 parent 56be7af
commit 961ec18
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 25 deletions.
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
@@ -805,7 +805,7 @@ fun buildV2RayConfig(
                                         }
                                     }
                                 }
-                                if (currentDomainStrategy == "AsIS") {
+                                if (currentDomainStrategy == "AsIs") {
                                     currentDomainStrategy = "UseIP"
                                 }
                             } else if (bean is SSHBean) {
@@ -869,7 +869,7 @@ fun buildV2RayConfig(
                             type = "field"
                             inboundTag = listOf(pastInboundTag)
                             outboundTag = tagIn
-                            if (currentOutbound.domainStrategy == "AsIS") {
+                            if (currentOutbound.domainStrategy == "AsIs") {
                                 currentOutbound.domainStrategy = "UseIP"
                             }
                         })
@@ -1204,7 +1204,7 @@ fun buildV2RayConfig(
         val bypassIP = HashSet<String>()
         val bypassDomain = HashSet<String>()
 
-        (proxies + extraProxies.values.flatten()).filter { !it.requireBean().isChain }.forEach {
+        (proxies + extraProxies.values.flatten()).forEach {
             it.requireBean().apply {
                 if (!serverAddress.isIpAddress()) {
                     bypassDomain.add("full:$serverAddress")

diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt
@@ -48,7 +48,7 @@ fun parseNaive(link: String): NaiveBean {
 fun NaiveBean.toUri(proxyOnly: Boolean = false): String {
     val builder = Libcore.newURL(if (proxyOnly) proto else "naive+$proto")
     builder.host = serverAddress
-    builder.port = serverPort
+    builder.port = finalPort
     if (username.isNotBlank()) {
         builder.username = username
         if (password.isNotBlank()) {

diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/shadowsocks/ShadowsocksBean.java b/app/src/main/java/io/nekohasekai/sagernet/fmt/shadowsocks/ShadowsocksBean.java
@@ -71,6 +71,13 @@ public void deserialize(ByteBufferInput input) {
         }
     }
 
+    @Override
+    public void applyFeatureSettings(AbstractBean other) {
+        if (!(other instanceof ShadowsocksBean)) return;
+        ShadowsocksBean bean = ((ShadowsocksBean) other);
+        bean.experimentReducedIvHeadEntropy = experimentReducedIvHeadEntropy;
+    }
+
     @NotNull
     @Override
     public ShadowsocksBean clone() {

diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/shadowsocks/ShadowsocksFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/shadowsocks/ShadowsocksFmt.kt
@@ -55,20 +55,6 @@ fun PluginConfiguration.fixInvalidParams() {
 
     }
 
-    if (selected == "obfs-local") {
-        val options = pluginsOptions["obfs-local"]
-        if (options != null) {
-            if (options.containsKey("mode")) {
-                options["obfs"] = options["mode"]
-                options.remove("mode")
-            }
-            if (options.containsKey("host")) {
-                options["obfs-host"] = options["host"]
-                options.remove("host")
-            }
-        }
-    }
-
 }
 
 fun ShadowsocksBean.fixInvalidParams() {

diff --git a/app/src/main/java/io/nekohasekai/sagernet/group/SIP008Updater.kt b/app/src/main/java/io/nekohasekai/sagernet/group/SIP008Updater.kt
@@ -77,7 +77,7 @@ object SIP008Updater : GroupUpdater() {
         for (profile in servers) {
             val bean = profile.parseShadowsocks()
             appendExtraInfo(profile, bean)
-            profiles.add(bean)
+            profiles.add(bean.applyDefaultValues())
         }
 
         if (subscription.forceResolve) forceResolve(profiles, proxyGroup.id)

diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
@@ -185,7 +185,7 @@
 
     <PreferenceCategory app:title="@string/cag_dns">
         <io.nekohasekai.sagernet.widget.NonBlackEditTextPreference
-            app:defaultValue="https://dns.google/dns-query"
+            app:defaultValue="tls://dns.google"
             app:icon="@drawable/ic_action_dns"
             app:key="remoteDns"
             app:title="@string/remote_dns"
@@ -195,7 +195,7 @@
             app:key="useLocalDnsAsDirectDns"
             app:title="@string/use_local_dns_as_direct_dns" />
         <io.nekohasekai.sagernet.widget.NonBlackEditTextPreference
-            app:defaultValue="https+local://doh.pub/dns-query"
+            app:defaultValue="tls+local://dot.pub"
             app:key="directDns"
             app:title="@string/direct_dns"
             app:useSimpleSummaryProvider="true" />

diff --git a/external/v2ray-core b/external/v2ray-core
diff --git a/library/core b/library/core
diff --git a/sager.properties b/sager.properties
@@ -1,6 +1,6 @@
 PACKAGE_NAME=io.nekohasekai.sagernet
-VERSION_NAME=0.7-beta04
-VERSION_CODE=146
+VERSION_NAME=0.7-beta05
+VERSION_CODE=147
 
 NAIVE_VERSION_NAME=97.0.4692.71-2
 NAIVE_VERSION=10