fix dns routing rule

MatsuriDayo · Mar 22, 2023 · 2ad8b91 · 2ad8b91
1 parent 506daa8
commit 2ad8b91
Showing 1 changed file with 18 additions and 4 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
@@ -691,24 +691,38 @@ fun buildConfig(
 
         // dns object user rules
         if (enableDnsRouting) {
-            if (domainListDNSRemote.isNotEmpty() || uidListDNSRemote.isNotEmpty()) {
+            if (uidListDNSRemote.isNotEmpty()) {
                 dns.rules.add(
                     DNSRule_DefaultOptions().apply {
-                        makeSingBoxRule(domainListDNSRemote.toHashSet().toList())
                         user_id = uidListDNSRemote.toHashSet().toList()
                         server = "dns-remote"
                     }
                 )
             }
-            if (domainListDNSDirect.isNotEmpty() || uidListDNSDirect.isNotEmpty()) {
+            if (domainListDNSRemote.isNotEmpty()) {
+                dns.rules.add(
+                    DNSRule_DefaultOptions().apply {
+                        makeSingBoxRule(domainListDNSRemote.toHashSet().toList())
+                        server = "dns-remote"
+                    }
+                )
+            }
+            if (uidListDNSDirect.isNotEmpty()) {
                 dns.rules.add(
                     DNSRule_DefaultOptions().apply {
-                        makeSingBoxRule(domainListDNSDirect.toHashSet().toList())
                         user_id = uidListDNSDirect.toHashSet().toList()
                         server = "dns-direct"
                     }
                 )
             }
+            if (domainListDNSDirect.isNotEmpty()) {
+                dns.rules.add(
+                    DNSRule_DefaultOptions().apply {
+                        makeSingBoxRule(domainListDNSDirect.toHashSet().toList())
+                        server = "dns-direct"
+                    }
+                )
+            }
             if (domainListDNSBlock.isNotEmpty()) {
                 dns.rules.add(
                     DNSRule_DefaultOptions().apply {