diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-18 12:20:30 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-18 12:20:30 +0000 |
| commit | cd86ddf0945ea3ade0f96eafc99adff2f3689be8 (patch) | |
| tree | 4e1afdf287d48a7a106733e849c610a6ac2f3e90 /android | |
| parent | 21338d7b8cc3b0697ac9d044a573e3fee3092298 (diff) | |
| download | mullvadvpn-cd86ddf0945ea3ade0f96eafc99adff2f3689be8.tar.xz mullvadvpn-cd86ddf0945ea3ade0f96eafc99adff2f3689be8.zip | |
Move confirmation parameter into the constructor
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt | 6 |
2 files changed, 4 insertions, 5 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 51d6dd5af0..df5c4cebb2 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,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { detachBackButtonHandler() transaction.addToBackStack(null) - ConfirmDnsDialogFragment() - .also { dialog -> dialog.confirmation = confirmation } + ConfirmDnsDialogFragment(confirmation) .show(transaction, null) jobTracker.newUiJob("restoreBackButtonHandler") { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt index 06e6fcfd9a..3741860d9d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt @@ -13,9 +13,9 @@ import androidx.fragment.app.DialogFragment import kotlinx.coroutines.CompletableDeferred import net.mullvad.mullvadvpn.R -class ConfirmDnsDialogFragment : DialogFragment() { - var confirmation: CompletableDeferred<Boolean>? = null - +class ConfirmDnsDialogFragment @JvmOverloads constructor( + private var confirmation: CompletableDeferred<Boolean>? = null +) : DialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, |
