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

Simplify browserDialer

Browse Source
This commit is contained in:
2dust committed 2026-07-29 21:20:04 +08:00
1 parent 4295d5d6d1
commit 35c39e4f36
10 files changed
+15 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt
+1 -1
View File
@@ -255,7 +255,7 @@ fun ServerScreen(
var finalMask by rememberSaveable { mutableStateOf(initialConfig.finalMask ?: "") }
var kcpMtu by rememberSaveable { mutableStateOf(initialConfig.kcpMtu?.toString() ?: "") }
var kcpTti by rememberSaveable { mutableStateOf(initialConfig.kcpTti?.toString() ?: "") }
var browserDialerMode by rememberSaveable { mutableStateOf(initialConfig.browserDialerMode ?: browserDialerOptions.firstOrNull() ?: "Disable") }
var browserDialerMode by rememberSaveable { mutableStateOf(initialConfig.browserDialerMode?: "") }
var streamSecurity by rememberSaveable { mutableStateOf(initialConfig.security ?: "") }
var sni by rememberSaveable { mutableStateOf(initialConfig.sni ?: "") }
var allowInsecure by rememberSaveable { mutableStateOf(initialConfig.insecure == true) }
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt
+1 -3
View File
@@ -14,12 +14,10 @@ class ServerHttpActivity : BaseServerActivity() {
@Composable
override fun ScreenContent() {
val options = rememberFieldOptions()
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = serverConfigType
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt
+1 -3
View File
@@ -18,12 +18,10 @@ class ServerHysteria2Activity : BaseServerActivity() {
@Composable
override fun ScreenContent() {
val options = rememberFieldOptions()
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.HYSTERIA2
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt
+1 -2
View File
@@ -21,8 +21,7 @@ class ServerShadowsocksActivity : BaseServerActivity() {
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.SHADOWSOCKS
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt
+1 -3
View File
@@ -14,12 +14,10 @@ class ServerSocksActivity : BaseServerActivity() {
@Composable
override fun ScreenContent() {
val options = rememberFieldOptions()
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = serverConfigType
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt
+1 -2
View File
@@ -20,8 +20,7 @@ class ServerTrojanActivity : BaseServerActivity() {
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.TROJAN
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt
+6 -8
View File
@@ -43,7 +43,7 @@ class ServerUiState(
finalMask: String = "",
kcpMtu: String = "",
kcpTti: String = "",
browserDialerMode: String = "Disable",
browserDialerMode: String = "",
streamSecurity: String = "",
sni: String = "",
allowInsecure: Boolean = false,
@@ -166,8 +166,7 @@ class ServerUiState(
companion object {
fun fromProfileItem(
initialConfig: ProfileItem,
browserDialerDefault: String
initialConfig: ProfileItem
): ServerUiState =
ServerUiState(
configType = initialConfig.configType,
@@ -198,7 +197,7 @@ class ServerUiState(
finalMask = initialConfig.finalMask ?: "",
kcpMtu = initialConfig.kcpMtu?.toString() ?: "",
kcpTti = initialConfig.kcpTti?.toString() ?: "",
browserDialerMode = initialConfig.browserDialerMode ?: browserDialerDefault,
browserDialerMode = initialConfig.browserDialerMode ?: "",
streamSecurity = initialConfig.security ?: "",
sni = initialConfig.sni ?: "",
allowInsecure = initialConfig.insecure == true,
@@ -214,15 +213,14 @@ class ServerUiState(
)
fun from(
initialConfig: ProfileItem,
browserDialerDefault: String
): ServerUiState = fromProfileItem(initialConfig, browserDialerDefault)
initialConfig: ProfileItem
): ServerUiState = fromProfileItem(initialConfig)
val Saver: Saver<ServerUiState, String> = Saver(
save = { JsonUtil.toJson(it.toProfileItem(ProfileItem.create(it.configType))) },
restore = { saved ->
JsonUtil.fromJsonSafe(saved, ProfileItem::class.java)?.let {
fromProfileItem(it, browserDialerDefault = "Disable")
fromProfileItem(it)
}
}
)
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt
+1 -2
View File
@@ -22,8 +22,7 @@ class ServerVlessActivity : BaseServerActivity() {
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.VLESS
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt
+1 -2
View File
@@ -22,8 +22,7 @@ class ServerVmessActivity : BaseServerActivity() {
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.VMESS
V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt
+1 -3
View File
@@ -15,12 +15,10 @@ class ServerWireguardActivity : BaseServerActivity() {
@Composable
override fun ScreenContent() {
val options = rememberFieldOptions()
val scope = rememberCoroutineScope()
val uiState = rememberSaveable(saver = ServerUiState.Saver) {
ServerUiState.from(
initialConfig = initialConfig,
browserDialerDefault = options.browserDialerOptions.firstOrNull() ?: "Disable"
initialConfig = initialConfig
)
}.apply {
configType = EConfigType.WIREGUARD