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 37fa450b..5b262fd1 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt @@ -48,7 +48,6 @@ object AppConfig { const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled" const val PREF_ALLOW_INSECURE = "pref_allow_insecure" const val PREF_SOCKS_PORT = "pref_socks_port" - const val PREF_HTTP_PORT = "pref_http_port" const val PREF_REMOTE_DNS = "pref_remote_dns" const val PREF_DOMESTIC_DNS = "pref_domestic_dns" const val PREF_DELAY_TEST_URL = "pref_delay_test_url" @@ -112,7 +111,6 @@ object AppConfig { /** Ports and addresses for various services. */ const val PORT_LOCAL_DNS = "10853" const val PORT_SOCKS = "10808" - const val PORT_HTTP = "10809" const val WIREGUARD_LOCAL_ADDRESS_V4 = "172.16.0.2/32" const val WIREGUARD_LOCAL_ADDRESS_V6 = "2606:4700:110:8f81:d551:a0:532e:a2b3/128" const val WIREGUARD_LOCAL_MTU = "1420" diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt index c5ae2278..15cde2c9 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt @@ -155,7 +155,7 @@ object SettingsManager { } fun getHttpPort(): Int { - return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt()) + return getSocksPort() + (if (Utils.isXray()) 0 else 1) } fun initAssets(context: Context, assets: AssetManager) { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt index 1a404d7c..6b14d0e4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt @@ -120,7 +120,6 @@ object V2rayConfigManager { private fun inbounds(v2rayConfig: V2rayConfig): Boolean { try { val socksPort = SettingsManager.getSocksPort() - val httpPort = SettingsManager.getHttpPort() v2rayConfig.inbounds.forEach { curInbound -> if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) { @@ -142,14 +141,13 @@ object V2rayConfigManager { v2rayConfig.inbounds[0].sniffing?.destOverride?.add("fakedns") } - v2rayConfig.inbounds[1].port = httpPort + if (Utils.isXray()) { + v2rayConfig.inbounds.removeAt(1) + } else { + val httpPort = SettingsManager.getHttpPort() + v2rayConfig.inbounds[1].port = httpPort + } -// if (httpPort > 0) { -// val httpCopy = v2rayConfig.inbounds[0].copy() -// httpCopy.port = httpPort -// httpCopy.protocol = "http" -// v2rayConfig.inbounds.add(httpCopy) -// } } catch (e: Exception) { e.printStackTrace() return false @@ -337,8 +335,8 @@ object V2rayConfigManager { if (proxyDomain.size > 0) { servers.add( V2rayConfig.DnsBean.ServersBean( - address = remoteDns.first(), - domains = proxyDomain, + address = remoteDns.first(), + domains = proxyDomain, ) ) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt index 6a92300b..ae6e2c22 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt @@ -58,7 +58,6 @@ class SettingsActivity : BaseActivity() { private val autoUpdateInterval by lazy { findPreference(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL) } private val socksPort by lazy { findPreference(AppConfig.PREF_SOCKS_PORT) } - private val httpPort by lazy { findPreference(AppConfig.PREF_HTTP_PORT) } private val remoteDns by lazy { findPreference(AppConfig.PREF_REMOTE_DNS) } private val domesticDns by lazy { findPreference(AppConfig.PREF_DOMESTIC_DNS) } private val delayTestUrl by lazy { findPreference(AppConfig.PREF_DELAY_TEST_URL) } @@ -142,11 +141,7 @@ class SettingsActivity : BaseActivity() { socksPort?.summary = if (TextUtils.isEmpty(nval)) AppConfig.PORT_SOCKS else nval true } - httpPort?.setOnPreferenceChangeListener { _, any -> - val nval = any as String - httpPort?.summary = if (TextUtils.isEmpty(nval)) AppConfig.PORT_HTTP else nval - true - } + remoteDns?.setOnPreferenceChangeListener { _, any -> val nval = any as String remoteDns?.summary = if (nval == "") AppConfig.DNS_PROXY else nval @@ -197,7 +192,6 @@ class SettingsActivity : BaseActivity() { autoUpdateInterval?.isEnabled = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false) socksPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS) - httpPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_HTTP_PORT, AppConfig.PORT_HTTP) remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY) domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT) delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl) @@ -215,7 +209,6 @@ class SettingsActivity : BaseActivity() { fragmentInterval, autoUpdateInterval, socksPort, - httpPort, remoteDns, domesticDns, delayTestUrl diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt index 69bdffd9..c1492868 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt @@ -498,5 +498,7 @@ object Utils { ContextCompat.RECEIVER_NOT_EXPORTED } + fun isXray(): Boolean = (ANG_PACKAGE == "com.v2ray.ang") + } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt index 5f984b0c..8dc50d58 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt @@ -34,7 +34,6 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application AppConfig.PREF_DELAY_TEST_URL, AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PREF_SOCKS_PORT, - AppConfig.PREF_HTTP_PORT, AppConfig.PREF_LOGLEVEL, AppConfig.PREF_LANGUAGE, AppConfig.PREF_UI_MODE_NIGHT, diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index 04bfad8a..a200418f 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -192,9 +192,6 @@ منفذ بروكسي SOCKS5 منفذ بروكسي SOCKS5 - منفذ بروكسي HTTP - منفذ بروكسي HTTP - منفذ DNS المحلي منفذ DNS المحلي diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index 9493008e..fd7a0c89 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -192,9 +192,6 @@ SOCKS5 প্রক্সি পোর্ট SOCKS5 প্রক্সি পোর্ট - HTTP প্রক্সি পোর্ট - HTTP প্রক্সি পোর্ট - স্থানীয় DNS পোর্ট স্থানীয় DNS পোর্ট diff --git a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml index cd3167c9..b8b81da0 100644 --- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml +++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml @@ -192,9 +192,6 @@ پورت پروکسی SOCKS5 پورت پروکسی SOCKS5 - پورت پروکسی HTTP - پورت پروکسی HTTP - پورت DNS مهلی پورت DNS مهلی diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index 4673660d..764485d9 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -191,9 +191,6 @@ پورت پروکسی SOCKS5 پورت پروکسی SOCKS5 - پورت پروکسی HTTP - پورت پروکسی HTTP - پورت DNS محلی پورت DNS محلی diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index 44382117..6a7e576f 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -192,9 +192,6 @@ Порт SOCKS5-прокси Порт SOCKS5-прокси - Порт HTTP-прокси - Порт HTTP-прокси - Локальный порт DNS Локальный порт DNS diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index be7697df..a2514982 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -191,9 +191,6 @@ Cổng Proxy SOCKS5 Cổng Proxy SOCKS5 - Cổng Proxy HTTP - Cổng Proxy HTTP - Cổng Local DNS Cổng Local DNS diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index 45d4edf5..ac92e14f 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -188,9 +188,6 @@ SOCKS5代理端口 SOCKS5代理端口 - HTTP代理端口 - HTTP代理端口 - 本地DNS端口 本地DNS端口 diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index 12eb38b8..265d5d90 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -190,9 +190,6 @@ SOCKS5 Proxy 埠 SOCKS5 Proxy 埠 - HTTP Proxy 埠 - HTTP Proxy 埠 - 本機 DNS 埠 本機 DNS 埠 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 46c76af3..862b1e08 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -195,9 +195,6 @@ SOCKS5 proxy port SOCKS5 proxy port - HTTP proxy port - HTTP proxy port - Local DNS port Local DNS port diff --git a/V2rayNG/app/src/main/res/xml/pref_settings.xml b/V2rayNG/app/src/main/res/xml/pref_settings.xml index 773a7fe4..7821c112 100644 --- a/V2rayNG/app/src/main/res/xml/pref_settings.xml +++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml @@ -180,12 +180,6 @@ android:summary="10808" android:title="@string/title_pref_socks_port" /> - -