Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add always on warning to local network sharing info dialog #7076

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Add always on warning to local network sharing info dialog #7076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e7a742
Add always on warning to lan info dialog
Pururun Oct 24, 2024
c8678d1
Update translations
Pururun Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...c/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/LocalNetworkSharingInfoDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() },
)
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ package net.mullvad.mullvadvpn.constant

const val EMPTY_STRING = ""
const val NEWLINE_STRING = "\n"
const val HTML_NEWLINE_STRING = "<br/>"
1 change: 1 addition & 0 deletions android/lib/resource/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 3 additions & 0 deletions gui/locales/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""

Expand Down
Loading