Avoid waiting for stable when active window is switched

NullPointerException was probably caused by the active window being
changing while we called `waitForStableInActiveWindow`.

2 files changed, 8 insertions, 16 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 c14be06208..11fc039be9 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
@@ -7,6 +7,7 @@ import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.UiObject2Condition
 import androidx.test.uiautomator.Until
+import androidx.test.uiautomator.waitForAppToBeVisible
 import co.touchlab.kermit.Logger
 import java.lang.Thread.sleep
 import java.util.regex.Pattern
@@ -104,3 +105,10 @@ fun UiObject2.findObjectWithTimeout(
         )
     }
 }
+
+fun UiDevice.acceptVpnPermissionDialog() {
+    findObjectWithTimeout(By.text("Connection request"))
+    // Accept Creating the VPN Permission profile
+    findObjectWithTimeout(By.text("OK")).click()
+    waitForAppToBeVisible(currentPackageName)
+}
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SystemVpnConfigurationAlert.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SystemVpnConfigurationAlert.kt
deleted file mode 100644
index 046d6e8197..0000000000
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/SystemVpnConfigurationAlert.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.mullvad.mullvadvpn.test.common.page
-
-import androidx.test.uiautomator.By
-import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
-
-class SystemVpnConfigurationAlert internal constructor() : Page() {
-    private val okSelector = By.text("OK")
-
-    override fun assertIsDisplayed() {
-        uiDevice.findObjectWithTimeout(okSelector)
-    }
-
-    fun clickOk() {
-        uiDevice.findObjectWithTimeout(okSelector).click()
-    }
-}