summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-17 23:21:08 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-18 12:44:17 +0000
commit55d43f7b62d118be3a228c140b2e7d45c95722b7 (patch)
tree394bbac3be0521008d7d79620988c84961712ee3 /android
parent106b92fdff8d54bfd2af6df5013477b297f866ed (diff)
downloadmullvadvpn-55d43f7b62d118be3a228c140b2e7d45c95722b7.tar.xz
mullvadvpn-55d43f7b62d118be3a228c140b2e7d45c95722b7.zip
Don't show dialog if Allow LAN is enabled
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index 625d5d88ba..c9ba93cd67 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -125,7 +125,8 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
private suspend fun confirmAddAddress(address: InetAddress): Boolean {
return when {
address.isLinkLocalAddress() || address.isSiteLocalAddress() -> {
- showConfirmDnsServerDialog(R.string.confirm_local_dns)
+ settingsListener.settings.allowLan ||
+ showConfirmDnsServerDialog(R.string.confirm_local_dns)
}
else -> showConfirmDnsServerDialog(R.string.confirm_public_dns)
}