summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-04-12 11:39:53 +0200
committerAlbin <albin@mullvad.net>2023-04-12 11:39:53 +0200
commitfcfd7a22b6c24a328fc0b204e8058de688520a27 (patch)
treeb3314dc88c5ae2ccf9b7c8e1a479fd5b20e74c76 /android/app/src
parent50a474c5be424577b674d9ac927abc5494503a9f (diff)
parent112e6cb7d44303038f56700fcaecba61c92e3dd5 (diff)
downloadmullvadvpn-fcfd7a22b6c24a328fc0b204e8058de688520a27.tar.xz
mullvadvpn-fcfd7a22b6c24a328fc0b204e8058de688520a27.zip
Merge branch 'hide-custom-dns-warning-droid-97'
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt24
1 files changed, 12 insertions, 12 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
index 110a20aa09..472ba2a2e8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
@@ -252,19 +252,19 @@ fun AdvancedSettingScreen(
background = MullvadBlue20
)
}
- }
- if (uiState.isCustomDnsEnabled) {
- item {
- ContentBlockersDisableModeCellSubtitle(
- Modifier.background(MullvadDarkBlue)
- .padding(
- start = cellHorizontalSpacing,
- top = topPadding,
- end = cellHorizontalSpacing,
- bottom = cellVerticalSpacing,
- )
- )
+ if (uiState.isCustomDnsEnabled) {
+ item {
+ ContentBlockersDisableModeCellSubtitle(
+ Modifier.background(MullvadDarkBlue)
+ .padding(
+ start = cellHorizontalSpacing,
+ top = topPadding,
+ end = cellHorizontalSpacing,
+ bottom = cellVerticalSpacing,
+ )
+ )
+ }
}
}