Skip to content

Commit

Permalink
Update privacy strings
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawa committed Oct 24, 2023
1 parent f54f4b9 commit 9f239f4
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material3.MaterialTheme
Expand All @@ -30,6 +32,7 @@ import androidx.constraintlayout.compose.Dimension
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
import net.mullvad.mullvadvpn.compose.util.toDp
import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.lib.theme.Dimens

Expand Down Expand Up @@ -73,22 +76,30 @@ fun PrivacyDisclaimerScreen(
) {
Text(
text = stringResource(id = R.string.privacy_disclaimer_title),
fontSize = 24.sp,
color = Color.White,
style = MaterialTheme.typography.headlineSmall,
color = MaterialTheme.colorScheme.onBackground,
fontWeight = FontWeight.Bold
)

Text(
text = stringResource(id = R.string.privacy_disclaimer_body),
text = stringResource(id = R.string.privacy_disclaimer_body_first_paragraph),
fontSize = 14.sp,
color = Color.White,
color = MaterialTheme.colorScheme.onBackground,
modifier = Modifier.padding(top = 10.dp)
)

Spacer(modifier = Modifier.size(20.sp.toDp()))

Text(
text = stringResource(id = R.string.privacy_disclaimer_body_second_paragraph),
fontSize = 14.sp,
color = MaterialTheme.colorScheme.onBackground,
)

Row(modifier = Modifier.padding(top = 10.dp)) {
ClickableText(
text = AnnotatedString(stringResource(id = R.string.privacy_policy_label)),
onClick = { onPrivacyPolicyLinkClicked.invoke() },
onClick = { onPrivacyPolicyLinkClicked() },
style =
TextStyle(
fontSize = 12.sp,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package net.mullvad.mullvadvpn.compose.util

import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit

@Composable
fun TextUnit.toDp(): Dp {
return with(LocalDensity.current) { this@toDp.toDp() }
}
3 changes: 2 additions & 1 deletion android/lib/resource/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@
<string name="new_device_notification_message"><![CDATA[Welcome, this device is now called <b>%s</b>. For more details see the info button in Account.]]></string>
<string name="agree_and_continue">Agree and continue</string>
<string name="privacy_disclaimer_title">Privacy</string>
<string name="privacy_disclaimer_body">To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.\n\nIf the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device.</string>
<string name="privacy_disclaimer_body_first_paragraph">To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.</string>
<string name="privacy_disclaimer_body_second_paragraph">If the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device.</string>
<string name="submit_button">Submit</string>
<string name="remove_button">Remove</string>
<string name="enter_value_placeholder">Enter MTU</string>
Expand Down
9 changes: 6 additions & 3 deletions gui/locales/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1789,9 +1789,6 @@ msgstr ""
msgid "This might cause issues on certain websites, services, and apps."
msgstr ""

msgid "To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.\\n\\nIf the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device."
msgstr ""

msgid "Toggle VPN"
msgstr ""

Expand Down Expand Up @@ -1902,3 +1899,9 @@ msgid "an hour ago"
msgid_plural "%d hours ago"
msgstr[0] ""
msgstr[1] ""

msgid "If the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device."
msgstr ""

msgid "To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you."
msgstr ""

0 comments on commit 9f239f4

Please sign in to comment.