diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-10-24 16:48:26 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-10-28 09:34:37 +0100 |
| commit | 2e7a742496c3593586435b7333f55e0af51c47f3 (patch) | |
| tree | 4f1306cffbb2b9b62d398e3ce9cff4ad88bbd6ce /android/app/src | |
| parent | 63638d781be8cbb2795f4e2764e277ff08e43869 (diff) | |
| download | mullvadvpn-2e7a742496c3593586435b7333f55e0af51c47f3.tar.xz mullvadvpn-2e7a742496c3593586435b7333f55e0af51c47f3.zip | |
Add always on warning to lan info dialog
Diffstat (limited to 'android/app/src')
2 files changed, 8 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/LocalNetworkSharingInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/LocalNetworkSharingInfoDialog.kt index 03713afba7..0cd5c5ff43 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/LocalNetworkSharingInfoDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/LocalNetworkSharingInfoDialog.kt @@ -11,6 +11,7 @@ import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator import com.ramcosta.composedestinations.spec.DestinationStyle import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.textResource +import net.mullvad.mullvadvpn.constant.HTML_NEWLINE_STRING import net.mullvad.mullvadvpn.lib.theme.AppTheme @Preview @@ -28,6 +29,12 @@ fun LocalNetworkSharingInfo(navigator: DestinationsNavigator) { buildString { appendLine(stringResource(id = R.string.local_network_sharing_additional_info)) appendLine(textResource(id = R.string.local_network_sharing_ip_ranges)) + // A html linebreak is specifically added since a normal linebreak is + // removed by the html parser + appendLine(HTML_NEWLINE_STRING) + appendLine( + textResource(id = R.string.local_network_sharing_info_block_connections_warning) + ) }, onDismiss = dropUnlessResumed { navigator.navigateUp() }, ) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt index 472f147732..23f4189feb 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt @@ -2,3 +2,4 @@ package net.mullvad.mullvadvpn.constant const val EMPTY_STRING = "" const val NEWLINE_STRING = "\n" +const val HTML_NEWLINE_STRING = "<br/>" |