Skip to content

Commit 9332dd0

Browse files
AnGgIt886AnGgIt886
committed
Merge branch 'dev'
2 parents d4cc105 + 7547d17 commit 9332dd0

File tree

15 files changed

+82
-57
lines changed

15 files changed

+82
-57
lines changed

‎.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ updates:
33
- package-ecosystem: github-actions
44
labels: []
55
directory: /
6-
target-branch: main
6+
target-branch: dev
77
schedule:
88
interval: daily
99
timezone: Asia/Jakarta
1010

1111
- package-ecosystem: gradle
1212
labels: []
1313
directory: /
14-
target-branch: main
14+
target-branch: dev
1515
schedule:
1616
interval: daily
1717
timezone: Asia/Jakarta
1818

1919
- package-ecosystem: gomod
2020
labels: []
2121
directory: /AndroidLibXrayLite
22-
target-branch: main
22+
target-branch: dev
2323
schedule:
2424
interval: daily
2525
timezone: Asia/Jakarta

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and Test
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- dev
77
workflow_dispatch:
88
branches:
99
- dev

‎.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Release
22

33
on:
44
push:
5+
branches:
6+
- main
57
tags:
68
- "v*.*.*"
79

‎.github/workflows/static.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ name: Deploy static content to Pages
44
on:
55
# Allows you to run this workflow manually from the Actions tab
66
workflow_dispatch:
7+
branches:
8+
- dev
79

810
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
911
permissions:

‎.github/workflows/update-gradle-wrapper.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Update Gradle wrapper
33
on:
44
schedule: [{cron: "0 16 * * *"}]
55
workflow_dispatch:
6+
branches:
7+
- dev
68

79
permissions:
810
contents: write # to be able to publish a GitHub release

‎AndroidLibXrayLite/go.mod

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22.4
44

55
require (
66
github.com/xtls/xray-core v1.8.25-0.20240907003027-3d9137cb6fdd
7-
golang.org/x/mobile v0.0.0-20240506190922-a1a533f289d3
7+
golang.org/x/mobile v0.0.0-20240930194658-c6794c95c70b
88
golang.org/x/sys v0.25.0
99
)
1010

@@ -27,7 +27,7 @@ require (
2727
github.com/quic-go/quic-go v0.46.0 // indirect
2828
github.com/refraction-networking/utls v1.6.7 // indirect
2929
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
30-
github.com/sagernet/sing v0.4.1 // indirect
30+
github.com/sagernet/sing v0.4.3 // indirect
3131
github.com/sagernet/sing-shadowsocks v0.2.7 // indirect
3232
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
3333
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect
@@ -38,17 +38,20 @@ require (
3838
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
3939
golang.org/x/crypto v0.27.0 // indirect
4040
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
41-
golang.org/x/mod v0.18.0 // indirect
41+
golang.org/x/mod v0.21.0 // indirect
4242
golang.org/x/net v0.29.0 // indirect
43+
golang.org/x/sync v0.8.0 // indirect
4344
golang.org/x/text v0.18.0 // indirect
4445
golang.org/x/time v0.5.0 // indirect
45-
golang.org/x/tools v0.22.0 // indirect
46+
golang.org/x/tools v0.25.0 // indirect
4647
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
4748
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
48-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
49-
google.golang.org/grpc v1.66.0 // indirect
49+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
50+
google.golang.org/grpc v1.67.0 // indirect
5051
google.golang.org/protobuf v1.34.2 // indirect
5152
gopkg.in/yaml.v2 v2.4.0 // indirect
5253
gvisor.dev/gvisor v0.0.0-20231202080848-1f7806d17489 // indirect
5354
lukechampine.com/blake3 v1.3.0 // indirect
5455
)
56+
57+
replace google.golang.org/grpc v1.67.0 => google.golang.org/grpc v1.66.1

‎AndroidLibXrayLite/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ github.com/refraction-networking/utls v1.6.7 h1:zVJ7sP1dJx/WtVuITug3qYUq034cDq9B
5050
github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
5151
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
5252
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
53-
github.com/sagernet/sing v0.4.1 h1:zVlpE+7k7AFoC2pv6ReqLf0PIHjihL/jsBl5k05PQFk=
54-
github.com/sagernet/sing v0.4.1/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls=
53+
github.com/sagernet/sing v0.4.3 h1:Ty/NAiNnVd6844k7ujlL5lkzydhcTH5Psc432jXA4Y8=
54+
github.com/sagernet/sing v0.4.3/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls=
5555
github.com/sagernet/sing-shadowsocks v0.2.7 h1:zaopR1tbHEw5Nk6FAkM05wCslV6ahVegEZaKMv9ipx8=
5656
github.com/sagernet/sing-shadowsocks v0.2.7/go.mod h1:0rIKJZBR65Qi0zwdKezt4s57y/Tl1ofkaq6NlkzVuyE=
5757
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 h1:emzAzMZ1L9iaKCTxdy3Em8Wv4ChIAGnfiz18Cda70g4=
@@ -68,8 +68,8 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
6868
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
6969
github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d h1:+B97uD9uHLgAAulhigmys4BVwZZypzK7gPN3WtpgRJg=
7070
github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE=
71-
github.com/xtls/xray-core v1.8.25-0.20240907003027-3d9137cb6fdd h1:SOBm0pxdipWhP8E4GbOOS0JZtRUE4NF6/3RKjdMHjGc=
72-
github.com/xtls/xray-core v1.8.25-0.20240907003027-3d9137cb6fdd/go.mod h1:fJZjuOpUJXPMrZj7agA8lMkz34U2ziEybL/+ABblwE8=
71+
github.com/xtls/xray-core v1.8.25-0.20240930152013-3b06af882de4 h1:gJX434Hl4x1vM/NXxXfstWDEND09+RAVvg2OhL17dc8=
72+
github.com/xtls/xray-core v1.8.25-0.20240930152013-3b06af882de4/go.mod h1:5lT1S32jgjJaqE9UoFhi05nudRYcGrUd/bLuaa8mWJM=
7373
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
7474
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
7575
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
@@ -78,10 +78,10 @@ golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
7878
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
7979
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg=
8080
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
81-
golang.org/x/mobile v0.0.0-20240506190922-a1a533f289d3 h1:lXH7reX0gtet9FgdXR0WDs3t1nt0QTjDLt1rrBQ/Qgs=
82-
golang.org/x/mobile v0.0.0-20240506190922-a1a533f289d3/go.mod h1:EiXZlVfUTaAyySFVJb9rsODuiO+WXu8HrUuySb7nYFw=
83-
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
84-
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
81+
golang.org/x/mobile v0.0.0-20240930194658-c6794c95c70b h1:vxPknApl9Z0hxiwF2MqAC8pI9Vr79/qaUj+6g6GE4gE=
82+
golang.org/x/mobile v0.0.0-20240930194658-c6794c95c70b/go.mod h1:5EJr05J3jS1A5hwVNxs4vC0pIRxtWmwM15D1ZxCj93s=
83+
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
84+
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
8585
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
8686
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
8787
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -95,16 +95,16 @@ golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
9595
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
9696
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
9797
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
98-
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
99-
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
98+
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
99+
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
100100
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
101101
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
102102
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
103103
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
104-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
106-
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
107-
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
106+
google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM=
107+
google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
108108
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
109109
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
110110
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎app/src/main/assets/custom_routing_black

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
{
18-
"remarks": "Block udp443",
18+
"remarks": "Blocking udp 443",
1919
"outboundTag": "block",
2020
"port": "443",
2121
"network": "udp"
@@ -28,17 +28,17 @@
2828
]
2929
},
3030
{
31-
"remarks": "Bypass LAN domain name",
31+
"remarks": "Bypass LAN IP",
3232
"outboundTag": "direct",
33-
"domain": [
34-
"geosite:private"
33+
"ip": [
34+
"geoip:private"
3535
]
3636
},
3737
{
38-
"remarks": "Bypass LAN IP",
38+
"remarks": "Bypass LAN domain name",
3939
"outboundTag": "direct",
40-
"ip": [
41-
"geoip:private"
40+
"domain": [
41+
"geosite:private"
4242
]
4343
},
4444
{
@@ -70,4 +70,4 @@
7070
"port": "0-65535",
7171
"outboundTag": "direct"
7272
}
73-
]
73+
]

‎app/src/main/assets/custom_routing_global

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"remarks": "Block udp443",
3+
"remarks": "Block udp 443",
44
"outboundTag": "block",
55
"port": "443",
66
"network": "udp"
@@ -13,22 +13,22 @@
1313
]
1414
},
1515
{
16-
"remarks": "Bypass LAN domain name",
16+
"remarks": "Bypass LAN IP",
1717
"outboundTag": "direct",
18-
"domain": [
19-
"geosite:private"
18+
"ip": [
19+
"geoip:private"
2020
]
2121
},
2222
{
23-
"remarks": "Bypass LAN IP",
23+
"remarks": "Bypass LAN domain name",
2424
"outboundTag": "direct",
25-
"ip": [
26-
"geoip:private"
25+
"domain": [
26+
"geosite:private"
2727
]
2828
},
2929
{
3030
"remarks": "Final Agent",
3131
"port": "0-65535",
3232
"outboundTag": "proxy"
3333
}
34-
]
34+
]

‎app/src/main/assets/custom_routing_white

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
]
99
},
1010
{
11-
"remarks": "Block udp443",
11+
"remarks": "Block udp 443",
1212
"outboundTag": "block",
1313
"port": "443",
1414
"network": "udp"
@@ -21,17 +21,17 @@
2121
]
2222
},
2323
{
24-
"remarks": "Bypass LAN domain name",
24+
"remarks": "Bypass LAN IP",
2525
"outboundTag": "direct",
26-
"domain": [
27-
"geosite:private"
26+
"ip": [
27+
"geoip:private"
2828
]
2929
},
3030
{
31-
"remarks": "Bypass LAN IP",
31+
"remarks": "Bypass LAN domain name",
3232
"outboundTag": "direct",
33-
"ip": [
34-
"geoip:private"
33+
"domain": [
34+
"geosite:private"
3535
]
3636
},
3737
{
@@ -78,4 +78,4 @@
7878
"port": "0-65535",
7979
"outboundTag": "proxy"
8080
}
81-
]
81+
]

‎app/src/main/java/com/neko/uwu/TambahActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TambahActivity : BaseActivity() {
4040
val toolbar = findViewById<MaterialToolbar>(R.id.toolbar)
4141
val toolbarLayout = findViewById<CollapsingToolbarLayout>(R.id.collapsing_toolbar)
4242
setSupportActionBar(toolbar)
43-
supportActionBar?.setDisplayHomeAsUpEnabled(true)
43+
supportActionBar?.setDisplayHomeAsUpEnabled(false)
4444
softInputAssist = SoftInputAssist(this)
4545

4646
etName = findViewById(R.id.et_name)

‎app/src/main/kotlin/com/neko/v2ray/AppConfig.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ object AppConfig {
108108
const val DNS_PROXY = "1.1.1.1"
109109
const val DNS_DIRECT = "223.5.5.5"
110110
const val DNS_VPN = "1.1.1.1"
111-
111+
const val GEOSITE_PRIVATE = "geosite:private"
112+
const val GEOSITE_CN = "geosite:cn"
113+
const val GEOIP_PRIVATE = "geoip:private"
114+
const val GEOIP_CN = "geoip:cn"
112115

113116
/** Ports and addresses for various services. */
114117
const val PORT_LOCAL_DNS = "10853"

‎app/src/main/kotlin/com/neko/v2ray/util/SettingsManager.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ package com.neko.v2ray.util
22

33
import android.content.Context
44
import android.text.TextUtils
5+
56
import com.neko.v2ray.AppConfig
7+
import com.neko.v2ray.AppConfig.GEOIP_PRIVATE
8+
import com.neko.v2ray.AppConfig.GEOSITE_PRIVATE
69
import com.neko.v2ray.dto.RulesetItem
710
import com.neko.v2ray.dto.ServerConfig
811
import com.neko.v2ray.util.MmkvManager.decodeProfileConfig
@@ -108,7 +111,11 @@ object SettingsManager {
108111

109112
fun routingRulesetsBypassLan(): Boolean {
110113
val rulesetItems = MmkvManager.decodeRoutingRulesets()
111-
val exist = rulesetItems?.any { it.enabled && it.domain?.contains(":private") == true }
114+
val exist = rulesetItems?.any {
115+
it.enabled
116+
&& (it.domain?.contains(GEOSITE_PRIVATE) == true
117+
|| it.ip?.contains(GEOIP_PRIVATE) == true)
118+
}
112119
return exist == true
113120
}
114121

‎app/src/main/kotlin/com/neko/v2ray/util/V2rayConfigUtil.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ package com.neko.v2ray.util
33
import android.content.Context
44
import android.text.TextUtils
55
import android.util.Log
6+
67
import com.neko.v2ray.AppConfig
78
import com.neko.v2ray.AppConfig.ANG_PACKAGE
9+
import com.neko.v2ray.AppConfig.GEOIP_CN
10+
import com.neko.v2ray.AppConfig.GEOSITE_CN
811
import com.neko.v2ray.AppConfig.LOOPBACK
12+
import com.neko.v2ray.AppConfig.GEOSITE_PRIVATE
913
import com.neko.v2ray.AppConfig.PROTOCOL_FREEDOM
1014
import com.neko.v2ray.AppConfig.TAG_BLOCKED
1115
import com.neko.v2ray.AppConfig.TAG_DIRECT
@@ -221,7 +225,9 @@ object V2rayConfigUtil {
221225
rulesetItems?.forEach { key ->
222226
if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
223227
key.domain?.forEach {
224-
if (it.startsWith("geosite:") || it.startsWith("domain:")) {
228+
if (it != GEOSITE_PRIVATE
229+
&& (it.startsWith("geosite:") || it.startsWith("domain:"))
230+
) {
225231
domain.add(it)
226232
}
227233
}
@@ -234,7 +240,7 @@ object V2rayConfigUtil {
234240
private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
235241
try {
236242
if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
237-
val geositeCn = arrayListOf("geosite:cn")
243+
val geositeCn = arrayListOf(GEOSITE_CN)
238244
val proxyDomain = userRule2Domain(TAG_PROXY)
239245
val directDomain = userRule2Domain(TAG_DIRECT)
240246
// fakedns with all domains to make it always top priority
@@ -325,8 +331,8 @@ object V2rayConfigUtil {
325331
// domestic DNS
326332
val domesticDns = Utils.getDomesticDnsServers()
327333
val directDomain = userRule2Domain(TAG_DIRECT)
328-
val isCnRoutingMode = directDomain.contains("geosite:cn")
329-
val geoipCn = arrayListOf("geoip:cn")
334+
val isCnRoutingMode = directDomain.contains(GEOSITE_CN)
335+
val geoipCn = arrayListOf(GEOIP_CN)
330336
if (directDomain.size > 0) {
331337
servers.add(
332338
V2rayConfig.DnsBean.ServersBean(

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.6.1" apply false
4-
id("com.android.library") version "8.6.1" apply false
3+
id("com.android.application") version "8.7.0" apply false
4+
id("com.android.library") version "8.7.0" apply false
55
id("org.jetbrains.kotlin.android") version "2.0.20" apply false
66
id("com.mikepenz.aboutlibraries.plugin") version "11.2.3" apply false
77
}

0 commit comments

Comments
 (0)