From e115bf0c6d32c4915ebafded747dfe25293f8c0a Mon Sep 17 00:00:00 2001 From: Tamim Hossain <132823494+CodeWithTamim@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:34:24 +0600 Subject: [PATCH] Refactor EConfigType to use constants from AppConfig (#3451) Updated the EConfigType enum to use protocol scheme constants from AppConfig. This change improves maintainability by centralizing protocol scheme definitions in a single location. --- .../src/main/kotlin/com/v2ray/ang/AppConfig.kt | 8 ++++++++ .../kotlin/com/v2ray/ang/dto/EConfigType.kt | 17 ++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt index 8396d71b..786b1db7 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt @@ -140,4 +140,12 @@ object AppConfig { const val RAY_NG_CHANNEL_NAME = "V2rayNG Background Service" const val SUBSCRIPTION_UPDATE_CHANNEL = "subscription_update_channel" const val SUBSCRIPTION_UPDATE_CHANNEL_NAME = "Subscription Update Service" + /** Protocols Scheme **/ + const val VMESS = "vmess://" + const val CUSTOM = "" + const val SHADOWSOCKS = "ss://" + const val SOCKS = "socks://" + const val VLESS = "vless://" + const val TROJAN = "trojan://" + const val WIREGUARD = "wireguard://" } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt index 5204c0ca..3db803de 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/EConfigType.kt @@ -1,13 +1,16 @@ package com.v2ray.ang.dto +import com.v2ray.ang.AppConfig + + enum class EConfigType(val value: Int, val protocolScheme: String) { - VMESS(1, "vmess://"), - CUSTOM(2, ""), - SHADOWSOCKS(3, "ss://"), - SOCKS(4, "socks://"), - VLESS(5, "vless://"), - TROJAN(6, "trojan://"), - WIREGUARD(7, "wireguard://"); + VMESS(1, AppConfig.VMESS), + CUSTOM(2, AppConfig.CUSTOM), + SHADOWSOCKS(3,AppConfig.SHADOWSOCKS), + SOCKS(4, AppConfig.SOCKS), + VLESS(5, AppConfig.VLESS), + TROJAN(6, AppConfig.TROJAN), + WIREGUARD(7, AppConfig.WIREGUARD); companion object { fun fromInt(value: Int) = values().firstOrNull { it.value == value }