Skip to content

Commit 312301d

Browse files
committed
feat: add RunetFreedom GEO update source
1 parent b0de4f3 commit 312301d

8 files changed

Lines changed: 23 additions & 4 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ An Xray client for Android, powered by [Xray-core](https://github.com/XTLS/Xray-
5454
- Runtime files are stored in the app private `files/xray` directory, commonly `/data/user/0/org.asterisk.zcc.ang/files/xray`.
5555
- The bundled Xray executable is restored from native libraries and can be replaced manually with an `xray` executable file or a zip archive containing `xray`.
5656
- `geoip.dat` and `geosite.dat` can be restored from bundled assets, updated from online sources, or replaced manually.
57-
- Built-in update sources include [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat), [v2fly/geoip](https://github.com/v2fly/geoip), [v2fly/domain-list-community](https://github.com/v2fly/domain-list-community), and [Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules).
57+
- Built-in update sources include [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat), [v2fly/geoip](https://github.com/v2fly/geoip), [v2fly/domain-list-community](https://github.com/v2fly/domain-list-community), [Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules), and [runetfreedom/russia-v2ray-rules-dat](https://github.com/runetfreedom/russia-v2ray-rules-dat).
5858

5959
## Development
6060

@@ -103,3 +103,4 @@ appops set org.asterisk.zcc.ang ACTIVATE_VPN allow
103103
- [@v2fly/geoip](https://github.com/v2fly/geoip)
104104
- [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community)
105105
- [@Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules)
106+
- [@runetfreedom/russia-v2ray-rules-dat](https://github.com/runetfreedom/russia-v2ray-rules-dat)

README_zh_CN.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
- 运行时文件存储在应用私有的 `files/xray` 目录中,通常为 `/data/user/0/org.asterisk.zcc.ang/files/xray`
5555
- 内置 Xray 可执行文件会从 native libraries 还原,也可以手动替换为 `xray` 可执行文件,或替换为包含 `xray` 的 zip 压缩包。
5656
- `geoip.dat``geosite.dat` 可以从内置 assets 还原、从在线来源更新,或手动替换。
57-
- 内置更新来源包括 [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat)[v2fly/geoip](https://github.com/v2fly/geoip)[v2fly/domain-list-community](https://github.com/v2fly/domain-list-community)[Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules)
57+
- 内置更新来源包括 [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat)[v2fly/geoip](https://github.com/v2fly/geoip)[v2fly/domain-list-community](https://github.com/v2fly/domain-list-community)[Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules)[runetfreedom/russia-v2ray-rules-dat](https://github.com/runetfreedom/russia-v2ray-rules-dat)
5858

5959
## 开发
6060

@@ -103,3 +103,4 @@ appops set org.asterisk.zcc.ang ACTIVATE_VPN allow
103103
- [@v2fly/geoip](https://github.com/v2fly/geoip)
104104
- [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community)
105105
- [@Chocolate4U/Iran-v2ray-rules](https://github.com/Chocolate4U/Iran-v2ray-rules)
106+
- [@runetfreedom/russia-v2ray-rules-dat](https://github.com/runetfreedom/russia-v2ray-rules-dat)

app/src/main/kotlin/app/AppStateModels.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ import features.resources.ResourceFileGeoIpOnlyCnPrivateName
1111
import features.resources.ResourceFileGeoSiteName
1212
import features.resources.ResourceFileLoyalsoldierGeoIpUrl
1313
import features.resources.ResourceFileLoyalsoldierGeoSiteUrl
14+
import features.resources.ResourceFileRunetFreedomGeoIpUrl
15+
import features.resources.ResourceFileRunetFreedomGeoSiteUrl
1416
import features.resources.ResourceFileSourceChocolate4UGithub
1517
import features.resources.ResourceFileSourceCustom
1618
import features.resources.ResourceFileSourceLoyalsoldierGithub
19+
import features.resources.ResourceFileSourceRunetFreedomGithub
1720
import features.resources.ResourceFileSourceV2FlyGithub
1821
import features.resources.ResourceFileV2FlyGeoIpUrl
1922
import features.resources.ResourceFileV2FlyGeoIpOnlyCnPrivateUrl
@@ -119,6 +122,12 @@ val ResourceFileUpdateSources = listOf(
119122
geoSiteUrl = ResourceFileChocolate4UGeoSiteUrl,
120123
geoIpOnlyCnPrivateUrl = ResourceFileV2FlyGeoIpOnlyCnPrivateUrl,
121124
),
125+
ResourceFileUpdateSource(
126+
id = ResourceFileSourceRunetFreedomGithub,
127+
geoIpUrl = ResourceFileRunetFreedomGeoIpUrl,
128+
geoSiteUrl = ResourceFileRunetFreedomGeoSiteUrl,
129+
geoIpOnlyCnPrivateUrl = ResourceFileV2FlyGeoIpOnlyCnPrivateUrl,
130+
),
122131
)
123132

124133
fun resourceFileUpdateSourceAt(index: Int): ResourceFileUpdateSource {

app/src/main/kotlin/features/resources/ResourceFileComponents.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ internal fun settingsResourceFileSourceOptions() = listOf(
6464
stringResource(R.string.settings_resource_files_source_loyalsoldier_github),
6565
stringResource(R.string.settings_resource_files_source_v2fly_github),
6666
stringResource(R.string.settings_resource_files_source_chocolate4u_github),
67+
stringResource(R.string.settings_resource_files_source_runetfreedom_github),
6768
stringResource(R.string.settings_resource_files_source_custom),
6869
)
6970

app/src/main/kotlin/features/resources/ResourceFileDefaults.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import app.ProjectInfo
88
const val ResourceFileSourceLoyalsoldierGithub = 0
99
const val ResourceFileSourceV2FlyGithub = 1
1010
const val ResourceFileSourceChocolate4UGithub = 2
11-
const val ResourceFileSourceCustom = 3
11+
const val ResourceFileSourceRunetFreedomGithub = 3
12+
const val ResourceFileSourceCustom = 4
1213

1314
const val ResourceFileGeoIpName = "geoip.dat"
1415
const val ResourceFileGeoSiteName = "geosite.dat"
@@ -27,5 +28,9 @@ const val ResourceFileChocolate4UGeoIpUrl =
2728
"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/geoip.dat"
2829
const val ResourceFileChocolate4UGeoSiteUrl =
2930
"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/geosite.dat"
31+
const val ResourceFileRunetFreedomGeoIpUrl =
32+
"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geoip.dat"
33+
const val ResourceFileRunetFreedomGeoSiteUrl =
34+
"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/geosite.dat"
3035

3136
const val XrayCoreVersion = ProjectInfo.XRAY_CORE_VERSION

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
<string name="settings_resource_files_source_loyalsoldier_github">Loyalsoldier(GitHub)</string>
145145
<string name="settings_resource_files_source_v2fly_github">V2Fly(GitHub)</string>
146146
<string name="settings_resource_files_source_chocolate4u_github">Chocolate4U(GitHub)</string>
147+
<string name="settings_resource_files_source_runetfreedom_github">RunetFreedom(GitHub)</string>
147148
<string name="settings_resource_files_source_custom">自定义</string>
148149
<string name="settings_resource_files_source_custom_title">自定义 geodata 地址</string>
149150
<string name="settings_resource_files_update">更新资源文件</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
<string name="settings_resource_files_source_loyalsoldier_github">Loyalsoldier (GitHub)</string>
145145
<string name="settings_resource_files_source_v2fly_github">V2Fly (GitHub)</string>
146146
<string name="settings_resource_files_source_chocolate4u_github">Chocolate4U (GitHub)</string>
147+
<string name="settings_resource_files_source_runetfreedom_github">RunetFreedom (GitHub)</string>
147148
<string name="settings_resource_files_source_custom">Custom</string>
148149
<string name="settings_resource_files_source_custom_title">Custom geodata URLs</string>
149150
<string name="settings_resource_files_update">Update resource files</string>

buildSrc/src/main/kotlin/BuildConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.gradle.api.tasks.TaskAction
1111
object ProjectConfig {
1212
const val JVM_VERSION = 25
1313
const val PROJECT_NAME = "AsteriskNG"
14-
const val VERSION_NAME = "1.2.3"
14+
const val VERSION_NAME = "1.2.4-dev"
1515
const val PACKAGE_NAME = "org.asterisk.zcc.ang"
1616
const val XRAY_CORE_VERSION = "v26.6.1"
1717
const val ANDROID_LIB_XRAY_LITE_VERSION = "v26.6.2"

0 commit comments

Comments
 (0)