summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/kotlin
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-17 23:13:28 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-18 12:44:17 +0000
commit106b92fdff8d54bfd2af6df5013477b297f866ed (patch)
tree9cc5040918318a9940cd94d699dc3ae7b1e1f9fd /android/src/main/kotlin
parentd781fd757d9030aa266a366e0d713a4bf2dd879a (diff)
downloadmullvadvpn-106b92fdff8d54bfd2af6df5013477b297f866ed.tar.xz
mullvadvpn-106b92fdff8d54bfd2af6df5013477b297f866ed.zip
Confirm adding local DNS server address
Diffstat (limited to 'android/src/main/kotlin')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt13
1 files changed, 7 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()