diff options
4 files changed, 12 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/>" diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index bac4cc8b17..a9ce59fca2 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -395,4 +395,5 @@ <string name="app_info">App info</string> <string name="changelog_title">Changelog</string> <string name="version">Version</string> + <string name="local_network_sharing_info_block_connections_warning">Attention: If \"Block connections without VPN\" is enabled, \"Local network sharing\" will not work.</string> </resources> diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index ec571e5364..517423d420 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -2292,6 +2292,9 @@ msgstr "" msgid "At least one method needs to be enabled" msgstr "" +msgid "Attention: If \"Block connections without VPN\" is enabled, \"Local network sharing\" will not work." +msgstr "" + msgid "Attention: If \"Block connections without VPN\" is enabled, split apps will not have Internet. Always keep in mind that split tunneling is a privacy risk." msgstr "" |