summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-11-19 19:26:02 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-14 13:59:04 +0000
commitde42d0ad3281bd7df987fd747a3a50688fc50251 (patch)
treed612e7b9dd3e621afd77f4349bab6d416b81ae88 /android/src
parentea40ff6455c5624a95fc0f53a7c3e65e23c28c27 (diff)
downloadmullvadvpn-de42d0ad3281bd7df987fd747a3a50688fc50251.tar.xz
mullvadvpn-de42d0ad3281bd7df987fd747a3a50688fc50251.zip
Add helper method to show confirmation dialog
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt17
1 files changed, 17 insertions, 0 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 a63de128fa..bdeb4a879c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -5,6 +5,7 @@ import android.support.v7.widget.LinearLayoutManager
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import kotlinx.coroutines.CompletableDeferred
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.model.Settings
import net.mullvad.mullvadvpn.ui.customdns.CustomDnsAdapter
@@ -118,6 +119,22 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
}
}
+ private fun showConfirmPublicDnsServerDialog(confirmation: CompletableDeferred<Boolean>) {
+ val transaction = fragmentManager?.beginTransaction()
+
+ detachBackButtonHandler()
+ transaction?.addToBackStack(null)
+
+ ConfirmPublicDnsDialogFragment()
+ .apply { confirmPublicDns = confirmation }
+ .show(transaction, null)
+
+ jobTracker.newUiJob("restoreBackButtonHandler") {
+ confirmation.await()
+ attachBackButtonHandler()
+ }
+ }
+
private fun attachBackButtonHandler() {
parentActivity.backButtonHandler = {
if (customDnsAdapter.isEditing) {