diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-17 22:54:12 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-18 12:08:46 +0000 |
| commit | 21338d7b8cc3b0697ac9d044a573e3fee3092298 (patch) | |
| tree | f412da816baa632b7adec862fe595f523f46a19d /android | |
| parent | 350c25bd08d4fe4335148039d3d848cdec431ca1 (diff) | |
| download | mullvadvpn-21338d7b8cc3b0697ac9d044a573e3fee3092298.tar.xz mullvadvpn-21338d7b8cc3b0697ac9d044a573e3fee3092298.zip | |
Rename to `ConfirmDnsDialogFragment`
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmPublicDnsDialogFragment.kt) | 14 |
2 files changed, 9 insertions, 9 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 07cadf5e0e..51d6dd5af0 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -140,8 +140,8 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { detachBackButtonHandler() transaction.addToBackStack(null) - ConfirmPublicDnsDialogFragment() - .apply { confirmPublicDns = confirmation } + ConfirmDnsDialogFragment() + .also { dialog -> dialog.confirmation = confirmation } .show(transaction, null) jobTracker.newUiJob("restoreBackButtonHandler") { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmPublicDnsDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt index c75662dcf0..06e6fcfd9a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmPublicDnsDialogFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt @@ -13,8 +13,8 @@ import androidx.fragment.app.DialogFragment import kotlinx.coroutines.CompletableDeferred import net.mullvad.mullvadvpn.R -class ConfirmPublicDnsDialogFragment : DialogFragment() { - var confirmPublicDns: CompletableDeferred<Boolean>? = null +class ConfirmDnsDialogFragment : DialogFragment() { + var confirmation: CompletableDeferred<Boolean>? = null override fun onCreateView( inflater: LayoutInflater, @@ -28,8 +28,8 @@ class ConfirmPublicDnsDialogFragment : DialogFragment() { } view.findViewById<Button>(R.id.confirm_button).setOnClickListener { - confirmPublicDns?.complete(true) - confirmPublicDns = null + confirmation?.complete(true) + confirmation = null dismiss() } @@ -49,17 +49,17 @@ class ConfirmPublicDnsDialogFragment : DialogFragment() { dialog?.window?.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) - if (confirmPublicDns == null) { + if (confirmation == null) { dismiss() } } override fun onDismiss(dialogInterface: DialogInterface) { - confirmPublicDns?.complete(false) + confirmation?.complete(false) } override fun onDestroy() { - confirmPublicDns?.cancel() + confirmation?.cancel() super.onDestroy() } |
