Merge branch 'dns-settings-text-additions-droid-123'

1 files changed, 81 insertions, 49 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingsScreenTest.kt
index 1aaf119773..340b903886 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingsScreenTest.kt
@@ -12,6 +12,8 @@ import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyAll
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.state.AdvancedSettingsUiState
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
 import net.mullvad.mullvadvpn.viewmodel.StagedDns
@@ -32,7 +34,10 @@ class AdvancedSettingsScreenTest {
     fun testDefaultState() {
         // Arrange
         composeTestRule.setContent {
-            AdvancedSettingScreen(uiState = AdvancedSettingsUiState.DefaultUiState())
+            AdvancedSettingScreen(
+                uiState = AdvancedSettingsUiState.DefaultUiState(),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+            )
         }
 
         // Assert
@@ -51,7 +56,8 @@ class AdvancedSettingsScreenTest {
         // Arrange
         composeTestRule.setContent {
             AdvancedSettingScreen(
-                uiState = AdvancedSettingsUiState.DefaultUiState(mtu = VALID_DUMMY_MTU_VALUE)
+                uiState = AdvancedSettingsUiState.DefaultUiState(mtu = VALID_DUMMY_MTU_VALUE),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -67,7 +73,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.DefaultUiState(),
-                onMtuCellClick = mockedClickHandler
+                onMtuCellClick = mockedClickHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -84,7 +91,8 @@ class AdvancedSettingsScreenTest {
         // Arrange
         composeTestRule.setContent {
             AdvancedSettingScreen(
-                uiState = AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = EMPTY_STRING)
+                uiState = AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = EMPTY_STRING),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -99,7 +107,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState =
-                    AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = VALID_DUMMY_MTU_VALUE)
+                    AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = VALID_DUMMY_MTU_VALUE),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -115,7 +124,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = EMPTY_STRING),
-                onMtuInputChange = mockedInputHandler
+                onMtuInputChange = mockedInputHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -135,7 +145,8 @@ class AdvancedSettingsScreenTest {
             AdvancedSettingScreen(
                 uiState =
                     AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = VALID_DUMMY_MTU_VALUE),
-                onSaveMtuClick = mockedSubmitHandler
+                onSaveMtuClick = mockedSubmitHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -153,7 +164,10 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState =
-                    AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = INVALID_DUMMY_MTU_VALUE)
+                    AdvancedSettingsUiState.MtuDialogUiState(
+                        mtuEditValue = INVALID_DUMMY_MTU_VALUE
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -169,7 +183,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = EMPTY_STRING),
-                onRestoreMtuClick = mockedClickHandler
+                onRestoreMtuClick = mockedClickHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -188,7 +203,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.MtuDialogUiState(mtuEditValue = EMPTY_STRING),
-                onCancelMtuDialogClicked = mockedClickHandler
+                onCancelMtuDialogClicked = mockedClickHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -207,7 +223,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.DefaultUiState(),
-                onSplitTunnelingNavigationClick = mockedClickHandler
+                onSplitTunnelingNavigationClick = mockedClickHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -232,9 +249,10 @@ class AdvancedSettingsScreenTest {
                             listOf(
                                 CustomDnsItem(address = DUMMY_DNS_ADDRESS, false),
                                 CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false),
-                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false)
-                            )
-                    )
+                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false),
+                            ),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -256,8 +274,9 @@ class AdvancedSettingsScreenTest {
                 uiState =
                     AdvancedSettingsUiState.DefaultUiState(
                         isCustomDnsEnabled = false,
-                        customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false))
-                    )
+                        customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false)),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -277,8 +296,9 @@ class AdvancedSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         isAllowLanEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
-                    )
+                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -297,8 +317,9 @@ class AdvancedSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         isAllowLanEnabled = false,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
-                    )
+                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -317,8 +338,9 @@ class AdvancedSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         isAllowLanEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
-                    )
+                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -337,8 +359,9 @@ class AdvancedSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         isAllowLanEnabled = false,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
-                    )
+                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -356,7 +379,8 @@ class AdvancedSettingsScreenTest {
         composeTestRule.setContent {
             AdvancedSettingScreen(
                 uiState = AdvancedSettingsUiState.DefaultUiState(isCustomDnsEnabled = true),
-                onDnsClick = mockedClickHandler
+                onDnsClick = mockedClickHandler,
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -377,9 +401,10 @@ class AdvancedSettingsScreenTest {
                     AdvancedSettingsUiState.DnsDialogUiState(
                         stagedDns =
                             StagedDns.NewDns(
-                                item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false)
-                            )
-                    )
+                                item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
+                            ),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -398,9 +423,10 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.EditDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                index = 0
-                            )
-                    )
+                                index = 0,
+                            ),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -419,10 +445,11 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = true),
-                                validationResult = StagedDns.ValidationResult.Success
+                                validationResult = StagedDns.ValidationResult.Success,
                             ),
-                        isAllowLanEnabled = false
-                    )
+                        isAllowLanEnabled = false,
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -441,10 +468,11 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = true),
-                                validationResult = StagedDns.ValidationResult.Success
+                                validationResult = StagedDns.ValidationResult.Success,
                             ),
-                        isAllowLanEnabled = true
-                    )
+                        isAllowLanEnabled = true,
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -463,10 +491,11 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                validationResult = StagedDns.ValidationResult.Success
+                                validationResult = StagedDns.ValidationResult.Success,
                             ),
-                        isAllowLanEnabled = true
-                    )
+                        isAllowLanEnabled = true,
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -485,10 +514,11 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                validationResult = StagedDns.ValidationResult.Success
+                                validationResult = StagedDns.ValidationResult.Success,
                             ),
-                        isAllowLanEnabled = false
-                    )
+                        isAllowLanEnabled = false,
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -507,9 +537,10 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                validationResult = StagedDns.ValidationResult.InvalidAddress
-                            )
-                    )
+                                validationResult = StagedDns.ValidationResult.InvalidAddress,
+                            ),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }
 
@@ -528,9 +559,10 @@ class AdvancedSettingsScreenTest {
                         stagedDns =
                             StagedDns.NewDns(
                                 item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                validationResult = StagedDns.ValidationResult.DuplicateAddress
-                            )
-                    )
+                                validationResult = StagedDns.ValidationResult.DuplicateAddress,
+                            ),
+                    ),
+                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
             )
         }