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

3 files changed, 9 insertions, 9 deletions

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(