diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt index 334aa414..20f5e35f 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt @@ -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) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt index 3f86b6ba..ecd38450 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt index bf70c889..2f152518 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt index 61555c52..b74da806 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt index ab3abd24..5b45323d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt index f7249abc..965a7670 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt index 2604728d..e64615a5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerUiState.kt @@ -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 = 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) } } ) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt index 033a021e..edf34132 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt index b707e458..1fa41d3d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt @@ -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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt index 70a77b53..2cbbbc7e 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt @@ -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