Merge branch 'deterministically-use-trailing-commas-in-kotlin-code-droid-89'

Author: albin-mullvad

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Actions.kt

@@ -7,7 +7,8 @@ import androidx.compose.ui.test.longClick
 import androidx.compose.ui.test.performTouchInput
 
 fun SemanticsNodeInteraction.performLongClick(): SemanticsNodeInteraction {
-    @OptIn(ExperimentalTestApi::class) return this.invokeGlobalAssertions().performLongClickImpl()
+    @OptIn(ExperimentalTestApi::class)
+    return this.invokeGlobalAssertions().performLongClickImpl()
 }
 
 private fun SemanticsNodeInteraction.performLongClickImpl(): SemanticsNodeInteraction {

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/Finders.kt

@@ -10,6 +10,6 @@ fun SemanticsNodeInteractionsProvider.onNodeWithTagAndText(
     text: String,
     substring: Boolean = false,
     ignoreCase: Boolean = false,
-    useUnmergedTree: Boolean = false
+    useUnmergedTree: Boolean = false,
 ): SemanticsNodeInteraction =
     onNode(hasTestTag(testTag).and(hasText(text, substring, ignoreCase)), useUnmergedTree)

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyApiAccessMethods.kt

@@ -15,7 +15,7 @@ val DIRECT_ACCESS_METHOD =
         id = ApiAccessMethodId.fromString(UUID1),
         name = ApiAccessMethodName.fromString("Direct"),
         enabled = true,
-        apiAccessMethod = ApiAccessMethod.Direct
+        apiAccessMethod = ApiAccessMethod.Direct,
     )
 
 val CUSTOM_ACCESS_METHOD =
@@ -28,6 +28,6 @@ val CUSTOM_ACCESS_METHOD =
                 ip = "1.1.1.1",
                 port = Port(123),
                 password = "Password",
-                cipher = Cipher.RC4
-            )
+                cipher = Cipher.RC4,
+            ),
     )

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/data/DummyRelayItems.kt

@@ -17,25 +17,22 @@ private val DUMMY_RELAY_1 =
         id =
             GeoLocationId.Hostname(
                 city = GeoLocationId.City(GeoLocationId.Country("RCo1"), "Relay City 1"),
-                "Relay host 1"
+                "Relay host 1",
             ),
         active = true,
         provider =
-            Provider(
-                providerId = ProviderId("PROVIDER RENTED"),
-                ownership = Ownership.Rented,
-            )
+            Provider(providerId = ProviderId("PROVIDER RENTED"), ownership = Ownership.Rented),
     )
 private val DUMMY_RELAY_2 =
     RelayItem.Location.Relay(
         id =
             GeoLocationId.Hostname(
                 city = GeoLocationId.City(GeoLocationId.Country("RCo2"), "Relay City 2"),
-                "Relay host 2"
+                "Relay host 2",
             ),
         active = true,
         provider =
-            Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned)
+            Provider(providerId = ProviderId("PROVIDER OWNED"), ownership = Ownership.MullvadOwned),
     )
 private val DUMMY_RELAY_CITY_1 =
     RelayItem.Location.City(
@@ -53,25 +50,21 @@ private val DUMMY_RELAY_COUNTRY_1 =
     RelayItem.Location.Country(
         name = "Relay Country 1",
         id = GeoLocationId.Country("RCo1"),
-        cities = listOf(DUMMY_RELAY_CITY_1)
+        cities = listOf(DUMMY_RELAY_CITY_1),
     )
 private val DUMMY_RELAY_COUNTRY_2 =
     RelayItem.Location.Country(
         name = "Relay Country 2",
         id = GeoLocationId.Country("RCo2"),
-        cities = listOf(DUMMY_RELAY_CITY_2)
+        cities = listOf(DUMMY_RELAY_CITY_2),
     )
 
 private val DUMMY_WIREGUARD_PORT_RANGES = ArrayList<PortRange>()
 private val DUMMY_WIREGUARD_ENDPOINT_DATA = WireguardEndpointData(DUMMY_WIREGUARD_PORT_RANGES)
 
 val DUMMY_RELAY_COUNTRIES = listOf(DUMMY_RELAY_COUNTRY_1, DUMMY_RELAY_COUNTRY_2)
 
-val DUMMY_RELAY_LIST =
-    RelayList(
-        DUMMY_RELAY_COUNTRIES,
-        DUMMY_WIREGUARD_ENDPOINT_DATA,
-    )
+val DUMMY_RELAY_LIST = RelayList(DUMMY_RELAY_COUNTRIES, DUMMY_WIREGUARD_ENDPOINT_DATA)
 
 val DUMMY_RELAY_ITEM_CUSTOM_LISTS =
     listOf(
@@ -80,31 +73,31 @@ val DUMMY_RELAY_ITEM_CUSTOM_LISTS =
                 CustomList(
                     name = CustomListName.fromString("First list"),
                     id = CustomListId("1"),
-                    locations = emptyList()
+                    locations = emptyList(),
                 ),
-            locations = DUMMY_RELAY_COUNTRIES
+            locations = DUMMY_RELAY_COUNTRIES,
         ),
         RelayItem.CustomList(
             customList =
                 CustomList(
                     name = CustomListName.fromString("Empty list"),
                     id = CustomListId("2"),
-                    locations = emptyList()
+                    locations = emptyList(),
                 ),
-            locations = emptyList()
-        )
+            locations = emptyList(),
+        ),
     )
 
 val DUMMY_CUSTOM_LISTS =
     listOf(
         CustomList(
             name = CustomListName.fromString("First list"),
             id = CustomListId("1"),
-            locations = DUMMY_RELAY_COUNTRIES.map { it.id }
+            locations = DUMMY_RELAY_COUNTRIES.map { it.id },
         ),
         CustomList(
             name = CustomListName.fromString("Empty list"),
             id = CustomListId("2"),
-            locations = emptyList()
-        )
+            locations = emptyList(),
+        ),
     )

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialogTest.kt

@@ -40,7 +40,7 @@ class CustomPortDialogTest {
             initialPort = initialPort,
             allowedPortRanges = allowedPortRanges,
             onSave = onSave,
-            onDismiss = onDismiss
+            onDismiss = onDismiss,
         )
     }
 

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteCustomListConfirmationDialogTest.kt

@@ -32,7 +32,7 @@ class DeleteCustomListConfirmationDialogTest {
             val name = CustomListName.fromString("List should be deleted")
             setContentWithTheme {
                 DeleteCustomListConfirmationDialog(
-                    state = DeleteCustomListUiState(name = name, deleteError = null),
+                    state = DeleteCustomListUiState(name = name, deleteError = null)
                 )
             }
 
@@ -49,7 +49,7 @@ class DeleteCustomListConfirmationDialogTest {
             setContentWithTheme {
                 DeleteCustomListConfirmationDialog(
                     state = DeleteCustomListUiState(name = name, deleteError = null),
-                    onDelete = mockedOnDelete
+                    onDelete = mockedOnDelete,
                 )
             }
 
@@ -69,7 +69,7 @@ class DeleteCustomListConfirmationDialogTest {
             setContentWithTheme {
                 DeleteCustomListConfirmationDialog(
                     state = DeleteCustomListUiState(name = name, deleteError = null),
-                    onBack = mockedOnBack
+                    onBack = mockedOnBack,
                 )
             }
 

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt

@@ -24,7 +24,7 @@ class DnsDialogTest {
             validationError = null,
             isLocal = false,
             isAllowLanEnabled = false,
-            index = null
+            index = null,
         )
 
     @SuppressLint("ComposableNaming")
@@ -34,7 +34,7 @@ class DnsDialogTest {
         onDnsInputChange: (String) -> Unit = { _ -> },
         onSaveDnsClick: () -> Unit = {},
         onRemoveDnsClick: (Int) -> Unit = {},
-        onDismiss: () -> Unit = {}
+        onDismiss: () -> Unit = {},
     ) {
         DnsDialog(state, onDnsInputChange, onSaveDnsClick, onRemoveDnsClick, onDismiss)
     }

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt

@@ -44,7 +44,7 @@ class MtuDialogTest {
             onInputChanged = onInputChanged,
             onSaveMtu = onSaveMtu,
             onResetMtu = onResetMtu,
-            onDismiss = onDismiss
+            onDismiss = onDismiss,
         )
     }
 
@@ -62,11 +62,7 @@ class MtuDialogTest {
     fun testMtuDialogWithEditValue() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme {
-                testMtuDialog(
-                    mtuInput = VALID_DUMMY_MTU_VALUE,
-                )
-            }
+            setContentWithTheme { testMtuDialog(mtuInput = VALID_DUMMY_MTU_VALUE) }
 
             // Assert
             onNodeWithText(VALID_DUMMY_MTU_VALUE).assertExists()
@@ -78,10 +74,7 @@ class MtuDialogTest {
             // Arrange
             val mockedSubmitHandler: (String) -> Unit = mockk(relaxed = true)
             setContentWithTheme {
-                testMtuDialog(
-                    VALID_DUMMY_MTU_VALUE,
-                    onSaveMtu = mockedSubmitHandler,
-                )
+                testMtuDialog(VALID_DUMMY_MTU_VALUE, onSaveMtu = mockedSubmitHandler)
             }
 
             // Act
@@ -107,10 +100,7 @@ class MtuDialogTest {
             // Arrange
             val mockedClickHandler: () -> Unit = mockk(relaxed = true)
             setContentWithTheme {
-                testMtuDialog(
-                    mtuInput = VALID_DUMMY_MTU_VALUE,
-                    onResetMtu = mockedClickHandler,
-                )
+                testMtuDialog(mtuInput = VALID_DUMMY_MTU_VALUE, onResetMtu = mockedClickHandler)
             }
 
             // Act
@@ -125,11 +115,7 @@ class MtuDialogTest {
         composeExtension.use {
             // Arrange
             val mockedClickHandler: () -> Unit = mockk(relaxed = true)
-            setContentWithTheme {
-                testMtuDialog(
-                    onDismiss = mockedClickHandler,
-                )
-            }
+            setContentWithTheme { testMtuDialog(onDismiss = mockedClickHandler) }
 
             // Assert
             onNodeWithText("Cancel").performClick()

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIPOverridesConfirmationDialogTest.kt

@@ -34,7 +34,7 @@ class ResetServerIPOverridesConfirmationDialogTest {
             setContentWithTheme {
                 ResetServerIpOverridesConfirmationDialog(
                     onNavigateBack = clickHandler,
-                    onClearAllOverrides = {}
+                    onClearAllOverrides = {},
                 )
             }
 
@@ -54,7 +54,7 @@ class ResetServerIPOverridesConfirmationDialogTest {
             setContentWithTheme {
                 ResetServerIpOverridesConfirmationDialog(
                     onNavigateBack = {},
-                    onClearAllOverrides = clickHandler
+                    onClearAllOverrides = clickHandler,
                 )
             }
 

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/SaveApiAccessMethodDialogTest.kt

@@ -29,7 +29,7 @@ class SaveApiAccessMethodDialogTest {
                     state =
                         SaveApiAccessMethodUiState(
                             testingState = TestApiAccessMethodState.Testing,
-                            isSaving = false
+                            isSaving = false,
                         )
                 )
             }
@@ -48,7 +48,7 @@ class SaveApiAccessMethodDialogTest {
                     state =
                         SaveApiAccessMethodUiState(
                             testingState = TestApiAccessMethodState.Result.Failure,
-                            isSaving = false
+                            isSaving = false,
                         )
                 )
             }
@@ -67,7 +67,7 @@ class SaveApiAccessMethodDialogTest {
                     state =
                         SaveApiAccessMethodUiState(
                             testingState = TestApiAccessMethodState.Result.Successful,
-                            isSaving = true
+                            isSaving = true,
                         )
                 )
             }
@@ -87,9 +87,9 @@ class SaveApiAccessMethodDialogTest {
                     state =
                         SaveApiAccessMethodUiState(
                             testingState = TestApiAccessMethodState.Testing,
-                            isSaving = false
+                            isSaving = false,
                         ),
-                    onCancel = onCancelClick
+                    onCancel = onCancelClick,
                 )
             }
 
@@ -110,9 +110,9 @@ class SaveApiAccessMethodDialogTest {
                     state =
                         SaveApiAccessMethodUiState(
                             testingState = TestApiAccessMethodState.Result.Failure,
-                            isSaving = false
+                            isSaving = false,
                         ),
-                    onSave = onSaveClick
+                    onSave = onSaveClick,
                 )
             }