diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt index 87be50e6..0a2a2946 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt @@ -92,7 +92,7 @@ object AppConfig { /** URLs for various resources. */ const val GITHUB_URL = "https://github.com" const val GITHUB_RAW_URL = "https://raw.githubusercontent.com" - const val GITHUB_DOWNLOAD = "releases/latest/download" + const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download" const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt" const val APP_URL = "$GITHUB_URL/2dust/v2rayNG" const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases" @@ -231,9 +231,9 @@ object AppConfig { ) val GEO_FILES_SOURCES = arrayListOf( - "$GITHUB_URL/Loyalsoldier/v2ray-rules-dat/$GITHUB_DOWNLOAD", - "$GITHUB_URL/runetfreedom/russia-v2ray-rules-dat/$GITHUB_DOWNLOAD", - "$GITHUB_URL/Chocolate4U/Iran-v2ray-rules/$GITHUB_DOWNLOAD" + "Loyalsoldier/v2ray-rules-dat", + "runetfreedom/russia-v2ray-rules-dat", + "Chocolate4U/Iran-v2ray-rules" ) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt index 526dfc88..efc0a39c 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt @@ -45,7 +45,6 @@ import java.util.Date class UserAssetActivity : BaseActivity() { private val binding by lazy { ActivityUserAssetBinding.inflate(layoutInflater) } - val extDir by lazy { File(Utils.userAssetPath(this)) } val builtInGeoFiles = arrayOf("geosite.dat", "geoip.dat") @@ -122,11 +121,7 @@ class UserAssetActivity : BaseActivity() { } private fun setGeoFilesSources() { - AlertDialog.Builder(this).setItems( - AppConfig.GEO_FILES_SOURCES - .map { it.replace(AppConfig.GITHUB_URL + "/", "").replace("/" + AppConfig.GITHUB_DOWNLOAD, "") } - .toTypedArray() - ) { _, i -> + AlertDialog.Builder(this).setItems(AppConfig.GEO_FILES_SOURCES.toTypedArray()) { _, i -> try { val value = AppConfig.GEO_FILES_SOURCES[i] MmkvManager.encodeSettings(AppConfig.PREF_GEO_FILES_SOURCES, value) @@ -290,7 +285,7 @@ class UserAssetActivity : BaseActivity() { list.add( Utils.getUuid() to AssetUrlItem( it, - getGeoFilesSources().concatUrl(it), + String.format(AppConfig.GITHUB_DOWNLOAD_URL, getGeoFilesSources()).concatUrl(it), locked = true ) ) diff --git a/V2rayNG/app/src/main/res/layout/activity_user_asset.xml b/V2rayNG/app/src/main/res/layout/activity_user_asset.xml index 5977bdd0..08d7583f 100644 --- a/V2rayNG/app/src/main/res/layout/activity_user_asset.xml +++ b/V2rayNG/app/src/main/res/layout/activity_user_asset.xml @@ -46,7 +46,7 @@ android:id="@+id/tv_geo_files_sources_summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/padding_spacing_dp16" + android:layout_marginTop="@dimen/padding_spacing_dp8" android:maxLines="2" android:textAppearance="@style/TextAppearance.AppCompat.Small" /> @@ -55,7 +55,7 @@