diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt index 72a73037..785a058e 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt @@ -100,8 +100,7 @@ abstract class BaseServerActivity : BaseComponentActivity() { @Composable protected fun CommonBasicFields( - state: ServerUiState, - showPort: Boolean = true + state: ServerUiState ) { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { FormTextField( @@ -114,14 +113,12 @@ abstract class BaseServerActivity : BaseComponentActivity() { state.address, { state.address = it } ) - if (showPort) { - FormTextField( - stringResource(R.string.server_lab_port), - state.port, - { state.port = it }, - keyboardType = KeyboardType.Number - ) - } + FormTextField( + stringResource(R.string.server_lab_port), + state.port, + { state.port = it }, + keyboardType = KeyboardType.Number + ) } } 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 1e5c8640..81253cb8 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 @@ -31,7 +31,7 @@ class ServerHysteria2Activity : BaseServerActivity() { title = serverConfigType.toString(), onSaveClick = { saveServer(uiState) } ) { - CommonBasicFields(uiState, showPort = false) + CommonBasicFields(uiState) Hysteria2ProtocolFields(uiState) } @@ -96,6 +96,12 @@ class ServerHysteria2Activity : BaseServerActivity() { state.pinnedCA256, { state.pinnedCA256 = it } ) + + FormTextField( + stringResource(R.string.server_lab_final_mask), + state.finalMask, + { state.finalMask = it } + ) } }