Merge branch 'fix-failing-leak-e2e-tests-droid-2141'

4 files changed, 12 insertions, 9 deletions

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 282f88a95f..871f66b092 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -33,7 +33,7 @@ androidx-test = "1.7.0"
 androidx-testmonitor = "1.8.0"
 androidx-testorchestrator = "1.6.1"
 androidx-testrunner = "1.7.0"
-androidx-uiautomator = "2.4.0-alpha05"
+androidx-uiautomator = "2.4.0-alpha06"
 androidx-tv = "1.0.1"
 
 # Arrow
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index d6fb2d9a82..1bd43ac121 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -2547,12 +2547,12 @@
             <sha256 value="3369693a0d79965888e674f0d05a3474d647ff46c4a62a5c8ea410a0126a20bf" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.test.uiautomator" name="uiautomator" version="2.4.0-alpha05">
-         <artifact name="uiautomator-2.4.0-alpha05.aar">
-            <sha256 value="44933f7d78b436d34c8a1aab0297fd597fd0a58a8350613a30044868ff9a4a00" origin="Generated by Gradle"/>
+      <component group="androidx.test.uiautomator" name="uiautomator" version="2.4.0-alpha06">
+         <artifact name="uiautomator-2.4.0-alpha06.aar">
+            <sha256 value="e383348cdd0d4cbda443e40c69e627b25538f3d763f1ed7dc0c52c61d7a70475" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="uiautomator-2.4.0-alpha05.module">
-            <sha256 value="4f74d74883b9f4dc6b4ab11cb3359102bdd9f72e67e16dc834b02b662e05c208" origin="Generated by Gradle"/>
+         <artifact name="uiautomator-2.4.0-alpha06.module">
+            <sha256 value="0a5d6196e100ba96517114d3043e1958ebca8e8c12e93e475e9ce0d1bfadefb8" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.tracing" name="tracing" version="1.0.0">
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
index de804ccb8e..9f9cf46091 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/misc/CaptureScreenRecordingsExtension.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.test.common.misc
 
 import android.os.Environment
 import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import androidx.test.uiautomator.UiDevice
 import co.touchlab.kermit.Logger
 import java.io.File
@@ -40,13 +41,15 @@ class CaptureScreenRecordingsExtension : BeforeEachCallback, AfterEachCallback {
 
         job =
             coroutineScope.launch {
-                device.executeShellCommand("screenrecord $OUTPUT_DIRECTORY/$fileName")
+                getInstrumentation()
+                    .uiAutomation
+                    .executeShellCommand("screenrecord $OUTPUT_DIRECTORY/$fileName")
             }
     }
 
     private fun stopScreenRecord() {
         try {
-            device.executeShellCommand("pkill -2 screenrecord")
+            getInstrumentation().uiAutomation.executeShellCommand("pkill -2 screenrecord")
             runBlocking { job.join() }
         } catch (e: Exception) {
             Logger.e("Failed to stop recording", e)
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortDialog.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortDialog.kt
index 2966cdeccf..55ea6c18c2 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortDialog.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortDialog.kt
@@ -13,7 +13,7 @@ class WireGuardCustomPortDialog internal constructor() : Page() {
     }
 
     fun enterCustomPort(port: String) {
-        uiDevice.findObjectWithTimeout(textFieldLabelSelector).parent.text = port
+        uiDevice.findObjectWithTimeout(textFieldLabelSelector).parent.parent.text = port
     }
 
     fun clickSetPort() {