diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-06-13 13:07:21 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-06-14 09:38:22 +0200 |
| commit | c54f026fa4c7bce338b42570b7c34bb5a150d19c (patch) | |
| tree | b8d674bfbfd09952960c1ca10a441a2ad9b925a6 /android/app | |
| parent | c16cf25c54688b3650524fc6f0035b82d9d8c541 (diff) | |
| download | mullvadvpn-c54f026fa4c7bce338b42570b7c34bb5a150d19c.tar.xz mullvadvpn-c54f026fa4c7bce338b42570b7c34bb5a150d19c.zip | |
Update auto-connect for TV users to legacy and update description
Diffstat (limited to 'android/app')
2 files changed, 3 insertions, 10 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt index 650c51d641..33e783662e 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt @@ -54,7 +54,7 @@ class VpnSettingsScreenTest { ) } - onNodeWithText("Auto-connect").assertExists() + onNodeWithText("Auto-connect (legacy)").assertExists() onNodeWithTag(LAZY_LIST_TEST_TAG) .performScrollToNode(hasTestTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt index 41b4ea8a2e..bc0c0443dd 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt @@ -331,14 +331,7 @@ fun VpnSettingsScreen( item { Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) HeaderSwitchComposeCell( - title = - stringResource( - if (state.systemVpnSettingsAvailable) { - R.string.auto_connect_legacy - } else { - R.string.auto_connect - } - ), + title = stringResource(R.string.auto_connect_legacy), isToggled = state.isAutoConnectEnabled, isEnabled = true, onCellClicked = { newValue -> onToggleAutoConnect(newValue) } @@ -354,7 +347,7 @@ fun VpnSettingsScreen( textResource(R.string.auto_connect_and_lockdown_mode) ) } else { - textResource(R.string.auto_connect_footer) + textResource(R.string.auto_connect_footer_legacy_tv) }, HtmlCompat.FROM_HTML_MODE_COMPACT ) |