summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-03-21 13:00:02 +0100
committerDavid Göransson <david.goransson@mullvad.net>2025-03-21 23:11:47 +0100
commit38a1fcde773a87866c874fcb38746c2efac17958 (patch)
treebf1cf988ca1d087007ecf96f0d2aa3cbd1a9ce78 /android/app/src
parente0c7be104ca84e1415591f710841e710d307e6c3 (diff)
downloadmullvadvpn-38a1fcde773a87866c874fcb38746c2efac17958.tar.xz
mullvadvpn-38a1fcde773a87866c874fcb38746c2efac17958.zip
Fix duplicate dns content blockers string
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt2
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt2
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
index ef62511061..ec2ff5e36f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
@@ -185,7 +185,7 @@ fun CustomDnsCellSubtitle(isCellClickable: Boolean, modifier: Modifier) {
} else {
textResource(
id = R.string.custom_dns_disable_mode_subtitle,
- textResource(id = R.string.dns_content_blockers_title),
+ textResource(id = R.string.dns_content_blockers),
)
}
Text(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt
index 6d032e1af0..ae53c99c4d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt
@@ -87,7 +87,7 @@ private fun FeatureIndicator.text(): String {
FeatureIndicator.SHADOWSOCKS,
FeatureIndicator.UDP_2_TCP -> R.string.feature_udp_2_tcp
FeatureIndicator.LAN_SHARING -> R.string.feature_lan_sharing
- FeatureIndicator.DNS_CONTENT_BLOCKERS -> R.string.feature_dns_content_blockers
+ FeatureIndicator.DNS_CONTENT_BLOCKERS -> R.string.dns_content_blockers
FeatureIndicator.CUSTOM_DNS -> R.string.feature_custom_dns
FeatureIndicator.SERVER_IP_OVERRIDE -> R.string.feature_server_ip_override
FeatureIndicator.CUSTOM_MTU -> R.string.feature_custom_mtu
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 2989dba047..8a43327fd3 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
@@ -364,7 +364,7 @@ fun VpnSettingsScreen(
itemWithDivider {
ExpandableComposeCell(
- title = stringResource(R.string.dns_content_blockers_title),
+ title = stringResource(R.string.dns_content_blockers),
isExpanded = expandContentBlockersState,
isEnabled = !state.isCustomDnsEnabled,
onInfoClicked = { navigateToContentBlockersInfo() },