Clean up hide dialog

3 files changed, 15 insertions, 11 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
index e3ed6c469d..49d43e6b27 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
@@ -43,7 +43,7 @@ class VpnSettingsFragment : BaseFragment() {
                         onDnsInputChange = vm::onDnsInputChange,
                         onSaveDnsClick = vm::onSaveDnsClick,
                         onRemoveDnsClick = vm::onRemoveDnsClick,
-                        onCancelDnsDialogClick = vm::onCancelDialogClick,
+                        onCancelDnsDialogClick = vm::onCancelDns,
                         onLocalNetworkSharingInfoClick = vm::onLocalNetworkSharingInfoClick,
                         onContentsBlockersInfoClick = vm::onContentsBlockerInfoClick,
                         onCustomDnsInfoClick = vm::onCustomDnsInfoClick,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
index 8a66818896..0827c81e99 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
@@ -77,14 +77,14 @@ class VpnSettingsViewModel(
                         isLocalNetworkSharingEnabled = settings?.allowLan ?: false,
                         isCustomDnsEnabled = settings?.isCustomDnsEnabled() ?: false,
                         customDnsList = settings?.addresses()?.asStringAddressList() ?: listOf(),
-                        contentBlockersOptions =
-                            settings?.contentBlockersSettings() ?: DefaultDnsOptions(),
+                        contentBlockersOptions = settings?.contentBlockersSettings()
+                                ?: DefaultDnsOptions(),
                         isAllowLanEnabled = settings?.allowLan ?: false,
-                        selectedObfuscation =
-                            settings?.selectedObfuscationSettings() ?: SelectedObfuscation.Off,
+                        selectedObfuscation = settings?.selectedObfuscationSettings()
+                                ?: SelectedObfuscation.Off,
                         dialogState = dialogState,
-                        quantumResistant =
-                            settings?.quantumResistant() ?: QuantumResistantState.Off,
+                        quantumResistant = settings?.quantumResistant()
+                                ?: QuantumResistantState.Off,
                         selectedWireguardPort = settings?.getWireguardPort() ?: Constraint.Any(),
                         availablePortRanges = portRanges
                     )
@@ -238,7 +238,7 @@ class VpnSettingsViewModel(
                 contentBlockersOptions = vmState.value.contentBlockersOptions
             )
 
-            dialogState.update { null }
+            hideDialog()
         }
 
     fun onToggleAutoConnect(isEnabled: Boolean) {
@@ -376,13 +376,17 @@ class VpnSettingsViewModel(
         }
 
     private fun hideDialog() {
+        dialogState.update { null }
+    }
+
+    fun onCancelDns() {
         if (
             vmState.value.dialogState is VpnSettingsDialogState.DnsDialog &&
                 vmState.value.customDnsList.isEmpty()
         ) {
             onToggleDnsClick(false)
         }
-        dialogState.update { null }
+        hideDialog()
     }
 
     private fun String.isDuplicateDns(stagedIndex: Int? = null): Boolean {
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
index ef872d8ae4..66d301d903 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
@@ -10,6 +10,7 @@ import io.mockk.unmockkAll
 import io.mockk.verify
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
+import kotlin.test.assertTrue
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
@@ -38,7 +39,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import kotlin.test.assertTrue
 
 class VpnSettingsViewModelTest {
     @get:Rule val testCoroutineRule = TestCoroutineRule()
@@ -189,7 +189,7 @@ class VpnSettingsViewModelTest {
                 ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
             portRangeSlot.captured.invoke(expectedPortRange)
             val state = awaitItem()
-            assertTrue{ state.dialog is VpnSettingsDialog.WireguardPortInfo }
+            assertTrue { state.dialog is VpnSettingsDialog.WireguardPortInfo }
             assertLists(expectedPortRange, state.availablePortRanges)
         }
     }