Batyka/v2rayNG
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #3002 from NetworkKeeper/patch-1

Browse Source 
Ability to override built in `geosite.dat` and `geoip.dat`
This commit is contained in:
2dust
2024-04-12 07:47:44 +08:00
committed by GitHub
parent 99b95d8369 f2af5c45e9
commit fa8113b8d7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/UserAssetActivity.kt
View File

@@ -231,13 +231,14 @@ class UserAssetActivity : BaseActivity() {
}
private fun addBuiltInGeoItems(assets: List<Pair<String, AssetUrlItem>>): List<Pair<String, AssetUrlItem>> {
val list = mutableListOf<Pair<String, AssetUrlItem>>()
builtInGeoFiles.forEach {
list.add(Utils.getUuid() to AssetUrlItem(
it,
AppConfig.geoUrl + it
)
)
}
builtInGeoFiles
.filter { geoFile -> assets.none { it.second.remarks == geoFile } }
.forEach {
list.add(Utils.getUuid() to AssetUrlItem(
it,
AppConfig.geoUrl + it
))
}
return list + assets
}
@@ -270,7 +271,7 @@ class UserAssetActivity : BaseActivity() {
holder.itemUserAssetBinding.assetProperties.text = getString(R.string.msg_file_not_found)
}
if (item.second.remarks in builtInGeoFiles) {
if (item.second.remarks in builtInGeoFiles && item.second.url == AppConfig.geoUrl + item.second.remarks) {
holder.itemUserAssetBinding.layoutEdit.visibility = GONE
holder.itemUserAssetBinding.layoutRemove.visibility = GONE
} else {