Reformat kotlin code using updated ktfmt plugin

This commit mostly adds trailing commas throughout the project,
but also includes a few other formatting changes.

13 files changed, 30 insertions, 34 deletions

diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/NameTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/NameTest.kt
index be397e6582..238b737809 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/NameTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/NameTest.kt
@@ -24,10 +24,6 @@ class NameTest {
 
     companion object {
         private val DISALLOWED_DECLARATION_OR_PARAMETER_NAMES =
-            listOf(
-                "accountToken",
-                "AccountToken",
-                "ACCOUNT_TOKEN",
-            )
+            listOf("accountToken", "AccountToken", "ACCOUNT_TOKEN")
     }
 }
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt
index 9f3d727d29..462639ed47 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt
@@ -19,7 +19,7 @@ fun UiObject2.findObjectByCaseInsensitiveText(text: String): UiObject2 {
 
 fun UiDevice.findObjectWithTimeout(
     selector: BySelector,
-    timeout: Long = DEFAULT_INTERACTION_TIMEOUT
+    timeout: Long = DEFAULT_INTERACTION_TIMEOUT,
 ): UiObject2 {
 
     wait(Until.hasObject(selector), timeout)
@@ -67,7 +67,7 @@ fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove(
 
 fun UiObject2.findObjectWithTimeout(
     selector: BySelector,
-    timeout: Long = DEFAULT_INTERACTION_TIMEOUT
+    timeout: Long = DEFAULT_INTERACTION_TIMEOUT,
 ): UiObject2 {
 
     wait(Until.hasObject(selector), timeout)
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt
index 19de2ac789..9abd2aa7e2 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt
@@ -21,14 +21,14 @@ import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 class AppInteractor(
     private val device: UiDevice,
     private val targetContext: Context,
-    private val targetPackageName: String
+    private val targetPackageName: String,
 ) {
     fun launch(customApiEndpointConfiguration: CustomApiEndpointConfiguration? = null) {
         device.pressHome()
         // Wait for launcher
         device.wait(
             Until.hasObject(By.pkg(device.launcherPackageName).depth(0)),
-            APP_LAUNCH_TIMEOUT
+            APP_LAUNCH_TIMEOUT,
         )
 
         val intent =
@@ -95,7 +95,7 @@ class AppInteractor(
             .findObjectWithTimeout(
                 // Text exist and contains IP address
                 By.res("location_info_connection_out_test_tag").textContains("."),
-                CONNECTION_TIMEOUT
+                CONNECTION_TIMEOUT,
             )
             .text
             .extractIpAddress()
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
index 2018714e09..4a64738aeb 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
@@ -38,14 +38,14 @@ class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatch
                     contentValues = contentValues,
                     contentResolver = contentResolver,
                     baseDir = baseDir,
-                    filename = filename
+                    filename = filename,
                 )
             } else {
                 writeToExternalStorage(
                     contentValues = contentValues,
                     contentResolver = contentResolver,
                     baseDir = baseDir,
-                    filename = filename
+                    filename = filename,
                 )
             }
         }
@@ -56,7 +56,7 @@ class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatch
         contentValues: ContentValues,
         contentResolver: ContentResolver,
         baseDir: String,
-        filename: String
+        filename: String,
     ) {
         contentValues.apply {
             put(MediaStore.MediaColumns.DISPLAY_NAME, filename)
@@ -84,7 +84,7 @@ class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatch
         contentValues: ContentValues,
         contentResolver: ContentResolver,
         baseDir: String,
-        filename: String
+        filename: String,
     ) {
         val screenshotBaseDirectory =
             Paths.get(
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt
index 160ef52468..278def0b35 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt
@@ -23,7 +23,7 @@ abstract class EndToEndTest(private val infra: String) {
         (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             GrantPermissionExtension.grant(
                 Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE
+                Manifest.permission.READ_EXTERNAL_STORAGE,
             )
         } else {
             GrantPermissionExtension.grant()
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt
index d4caa1da56..5ea05159a6 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt
@@ -25,7 +25,7 @@ class WebLinkTest : EndToEndTest(BuildConfig.FLAVOR_infrastructure) {
         // Then
         device.findObjectWithTimeout(
             selector = By.text("Mullvad help center"),
-            timeout = WEB_TIMEOUT
+            timeout = WEB_TIMEOUT,
         )
     }
 }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt
index 59c9b49b91..b4b3f19e05 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt
@@ -4,7 +4,7 @@ import net.mullvad.mullvadvpn.test.e2e.misc.SimpleMullvadHttpClient
 
 class MullvadAccountInteractor(
     private val httpClient: SimpleMullvadHttpClient,
-    private val testAccountNumber: String
+    private val testAccountNumber: String,
 ) {
     fun cleanupAccount() {
         httpClient.removeAllDevices(testAccountNumber)
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt
index 6496f82e07..ff6276a69f 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt
@@ -23,7 +23,7 @@ class AccountTestRule : BeforeEachCallback {
                 client.addTimeToAccountUsingPartnerAuth(
                     accountNumber = validAccountNumber,
                     daysToAdd = 1,
-                    partnerAuth = partnerAuth
+                    partnerAuth = partnerAuth,
                 )
             } else {
                 validAccountNumber =
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt
index eaff4290ed..d7fcfb05e8 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt
@@ -48,13 +48,13 @@ class SimpleMullvadHttpClient(context: Context) {
     fun addTimeToAccountUsingPartnerAuth(
         accountNumber: String,
         daysToAdd: Int,
-        partnerAuth: String
+        partnerAuth: String,
     ) {
         sendSimpleSynchronousRequest(
             method = Request.Method.POST,
             url = "$PARTNER_ACCOUNT_URL/$accountNumber/extend",
             body = JSONObject().apply { put("days", "$daysToAdd") },
-            authorizationHeader = "Basic $partnerAuth"
+            authorizationHeader = "Basic $partnerAuth",
         )
     }
 
@@ -65,7 +65,7 @@ class SimpleMullvadHttpClient(context: Context) {
             sendSimpleSynchronousRequestArray(
                 Request.Method.GET,
                 DEVICE_LIST_URL,
-                token = accessToken
+                token = accessToken,
             )
 
         return response!!
@@ -85,7 +85,7 @@ class SimpleMullvadHttpClient(context: Context) {
         sendSimpleSynchronousRequestString(
             method = Request.Method.DELETE,
             url = "$DEVICE_LIST_URL/$deviceId",
-            authorizationHeader = "Bearer $token"
+            authorizationHeader = "Bearer $token",
         )
     }
 
@@ -95,7 +95,7 @@ class SimpleMullvadHttpClient(context: Context) {
             ?.let { json ->
                 ConnCheckState(
                     isConnected = json.getBoolean("mullvad_exit_ip"),
-                    ipAddress = json.getString("ip")
+                    ipAddress = json.getString("ip"),
                 )
             }
     }
@@ -104,7 +104,7 @@ class SimpleMullvadHttpClient(context: Context) {
         method: Int,
         url: String,
         body: JSONObject? = null,
-        authorizationHeader: String? = null
+        authorizationHeader: String? = null,
     ): JSONObject? {
         val future = RequestFuture.newFuture<JSONObject>()
 
@@ -134,7 +134,7 @@ class SimpleMullvadHttpClient(context: Context) {
         method: Int,
         url: String,
         body: String? = null,
-        authorizationHeader: String? = null
+        authorizationHeader: String? = null,
     ): String? {
         val future = RequestFuture.newFuture<String>()
         val request =
@@ -163,7 +163,7 @@ class SimpleMullvadHttpClient(context: Context) {
         method: Int,
         url: String,
         body: JSONArray? = null,
-        token: String? = null
+        token: String? = null,
     ): JSONArray? {
         val future = RequestFuture.newFuture<JSONArray>()
         val request =
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
index 3539bad0fa..a2978808d7 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
@@ -83,7 +83,7 @@ class MockApiDispatcher : Dispatcher() {
                 .setBody(
                     accessTokenJsonResponse(
                             accessToken = DUMMY_ACCESS_TOKEN,
-                            expiry = currentUtcTimeWithOffsetZero().plusDays(1)
+                            expiry = currentUtcTimeWithOffsetZero().plusDays(1),
                         )
                         .toString()
                 )
@@ -114,7 +114,7 @@ class MockApiDispatcher : Dispatcher() {
                             id = deviceId,
                             name = devices!![deviceId]!!, // Should always exist
                             publicKey = cachedKey,
-                            creationDate = currentUtcTimeWithOffsetZero().minusDays(1)
+                            creationDate = currentUtcTimeWithOffsetZero().minusDays(1),
                         )
                         .toString()
                 )
@@ -135,7 +135,7 @@ class MockApiDispatcher : Dispatcher() {
                                     id = devicePendingToGetCreated!!.first,
                                     name = devicePendingToGetCreated!!.second,
                                     publicKey = newKey,
-                                    creationDate = currentUtcTimeWithOffsetZero().minusDays(1)
+                                    creationDate = currentUtcTimeWithOffsetZero().minusDays(1),
                                 )
                                 .toString()
                         )
@@ -157,7 +157,7 @@ class MockApiDispatcher : Dispatcher() {
                         id = entry.key,
                         name = entry.value,
                         publicKey = cachedKey,
-                        creationDate = currentUtcTimeWithOffsetZero().minusDays(index + 1)
+                        creationDate = currentUtcTimeWithOffsetZero().minusDays(index + 1),
                     )
                 )
             }
@@ -174,7 +174,7 @@ class MockApiDispatcher : Dispatcher() {
                     accountCreationJson(
                             id = DUMMY_ID_1,
                             expiry = DateTime(),
-                            accountNumber = expectedAccountNumber
+                            accountNumber = expectedAccountNumber,
                         )
                         .toString()
                 )
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
index 74a47f3c3d..bd236bb978 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
@@ -59,7 +59,7 @@ abstract class MockApiTest {
             InetAddress.getLocalHost().hostName,
             port,
             disableAddressCache = true,
-            disableTls = true
+            disableTls = true,
         )
     }
 }
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
index c652bd403a..fbd3c3ca84 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
@@ -34,7 +34,7 @@ class TooManyDevicesMockApiTest : MockApiTest() {
                     DUMMY_ID_2 to DUMMY_DEVICE_NAME_2,
                     DUMMY_ID_3 to DUMMY_DEVICE_NAME_3,
                     DUMMY_ID_4 to DUMMY_DEVICE_NAME_4,
-                    DUMMY_ID_5 to DUMMY_DEVICE_NAME_5
+                    DUMMY_ID_5 to DUMMY_DEVICE_NAME_5,
                 )
             devicePendingToGetCreated = DUMMY_ID_6 to DUMMY_DEVICE_NAME_6
         }
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt
index 27099cc67a..e11e14879e 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt
@@ -31,5 +31,5 @@ val FULL_DEVICE_LIST =
         DUMMY_ID_2 to DUMMY_DEVICE_NAME_2,
         DUMMY_ID_3 to DUMMY_DEVICE_NAME_3,
         DUMMY_ID_4 to DUMMY_DEVICE_NAME_4,
-        DUMMY_ID_5 to DUMMY_DEVICE_NAME_5
+        DUMMY_ID_5 to DUMMY_DEVICE_NAME_5,
     )