summaryrefslogtreecommitdiffhomepage
path: root/android/app
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-08-31 15:16:46 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-09-01 07:57:22 +0200
commitff74284daee2b4b5f9e32f53af0bc17db4bf010e (patch)
tree7b70d20c50a492e28807fa24bf61fa926e354aad /android/app
parenta7a5fdbf63129b01de8ce4094954742db14fac33 (diff)
downloadmullvadvpn-ff74284daee2b4b5f9e32f53af0bc17db4bf010e.tar.xz
mullvadvpn-ff74284daee2b4b5f9e32f53af0bc17db4bf010e.zip
Limit length of custom port input to 5
Diffstat (limited to 'android/app')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt3
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomPortTextField.kt6
2 files changed, 5 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
index 1d42503d1c..b5487ed436 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.button.ActionButton
-import net.mullvad.mullvadvpn.compose.test.CUSTOM_PORT_DIALOG_INPUT_TEST_TAG
import net.mullvad.mullvadvpn.compose.textfield.CustomPortTextField
import net.mullvad.mullvadvpn.lib.theme.AlphaDescription
import net.mullvad.mullvadvpn.lib.theme.AlphaDisabled
@@ -119,7 +118,7 @@ fun CustomPortDialog(
isValidValue =
port.value.isNotEmpty() &&
allowedPortRanges.isPortInValidRanges(port.value.toIntOrNull() ?: 0),
- modifier = Modifier.testTag(CUSTOM_PORT_DIALOG_INPUT_TEST_TAG)
+ maxCharLength = 5
)
Spacer(modifier = Modifier.height(Dimens.smallPadding))
Text(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomPortTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomPortTextField.kt
index 956c65eedf..e1478e1987 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomPortTextField.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomPortTextField.kt
@@ -12,7 +12,8 @@ fun CustomPortTextField(
modifier: Modifier = Modifier,
onSubmit: (String) -> Unit,
onValueChanged: (String) -> Unit,
- isValidValue: Boolean
+ isValidValue: Boolean,
+ maxCharLength: Int
) {
CustomTextField(
value = value,
@@ -24,6 +25,7 @@ fun CustomPortTextField(
onSubmit = onSubmit,
isDigitsOnlyAllowed = true,
isEnabled = true,
- isValidValue = isValidValue
+ isValidValue = isValidValue,
+ maxCharLength = maxCharLength
)
}