Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 22:50:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor rule provider selection (#547)

Browse Source
This commit is contained in:
Artur Khusainov 2024-02-08 07:24:31 +03:00 committed by GitHub
parent fb55430f67
commit 89ef91cebe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/io/nekohasekai/sagernet/ui/AssetsActivity.kt
View File

@ -249,25 +249,25 @@ class AssetsActivity : ThemedActivity() {
} }
private val rulesProviders = listOf(
RuleAssetsProvider(
"SagerNet/sing-geoip",
"SagerNet/sing-geosite",
),
RuleAssetsProvider(
"soffchen/sing-geoip",
"soffchen/sing-geosite",
),
RuleAssetsProvider(
"Chocolate4U/Iran-sing-box-rules"
),
)
suspend fun updateAsset(file: File, versionFile: File, localVersion: String) { suspend fun updateAsset(file: File, versionFile: File, localVersion: String) {
val repo: String
var fileName = file.name var fileName = file.name
if (DataStore.rulesProvider == 0) { val ruleProvider = rulesProviders[DataStore.rulesProvider]
if (file.name == assetNames[0]) { val repo = ruleProvider.repoByFileName[fileName]
repo = "SagerNet/sing-geoip"
} else {
repo = "SagerNet/sing-geosite"
}
} else if (DataStore.rulesProvider == 1) {
if (file.name == assetNames[0]) {
repo = "soffchen/sing-geoip"
} else {
repo = "soffchen/sing-geosite"
}
} else {
repo = "Chocolate4U/Iran-sing-box-rules"
}
val client = Libcore.newHttpClient().apply { val client = Libcore.newHttpClient().apply {
modernTLS() modernTLS()
@ -340,5 +340,17 @@ class AssetsActivity : ThemedActivity() {
} }
} }
private data class RuleAssetsProvider(
val repoByFileName: Map<String, String>
) {
constructor(
geoipRepo: String,
geositeRepo: String = geoipRepo,
) : this(
mapOf(
"geoip.db" to geoipRepo,
"geosite.db" to geositeRepo,
)
)
}
} }