diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt | 13 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 2 |
2 files changed, 9 insertions, 6 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 9512b0a130..625d5d88ba 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -123,21 +123,22 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { } private suspend fun confirmAddAddress(address: InetAddress): Boolean { - return if (address.isLinkLocalAddress() || address.isSiteLocalAddress()) { - return true - } else { - showConfirmDnsServerDialog() + return when { + address.isLinkLocalAddress() || address.isSiteLocalAddress() -> { + showConfirmDnsServerDialog(R.string.confirm_local_dns) + } + else -> showConfirmDnsServerDialog(R.string.confirm_public_dns) } } - private suspend fun showConfirmDnsServerDialog(): Boolean { + private suspend fun showConfirmDnsServerDialog(message: Int): Boolean { val confirmation = CompletableDeferred<Boolean>() val transaction = parentFragmentManager.beginTransaction() detachBackButtonHandler() transaction.addToBackStack(null) - ConfirmDnsDialogFragment(R.string.confirm_public_dns, confirmation) + ConfirmDnsDialogFragment(message, confirmation) .show(transaction, null) val result = confirmation.await() diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 397b9b81bc..05cff41571 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -170,6 +170,8 @@ <string name="add_a_server">Add a server</string> <string name="custom_dns_example">e.g. 10.0.0.4</string> <string name="custom_dns_footer">Enable to add at least one DNS server.</string> + <string name="confirm_local_dns">The local DNS server will not work unless you enable \"Local + Network Sharing\" under Preferences.</string> <string name="confirm_public_dns">The DNS server you are trying to add might not work because it is public. Currently we only support local DNS servers.</string> <string name="add_anyway">Add anyway</string> |