Merge branch 'notification-permission-prompt-missing-droid-19'

5 files changed, 12 insertions, 12 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 19cc5a8b93..b40fcd3bc2 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
@@ -37,10 +37,10 @@ fun UiDevice.clickAgreeOnPrivacyDisclaimer() {
     findObjectWithTimeout(By.text("Agree and continue")).click()
 }
 
-fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove(
+fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove(
     timeout: Long = DEFAULT_INTERACTION_TIMEOUT
 ) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
         // Skipping as notification permissions are not shown.
         return
     }
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 d5a2e5176b..399b702ddb 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
@@ -17,7 +17,7 @@ import net.mullvad.mullvadvpn.test.common.constant.SETTINGS_COG_ID
 import net.mullvad.mullvadvpn.test.common.constant.TUNNEL_INFO_ID
 import net.mullvad.mullvadvpn.test.common.constant.TUNNEL_OUT_ADDRESS_ID
 import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer
-import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove
+import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 
 class AppInteractor(private val device: UiDevice, private val targetContext: Context) {
@@ -44,7 +44,7 @@ class AppInteractor(private val device: UiDevice, private val targetContext: Con
     fun launchAndEnsureLoggedIn(accountToken: String) {
         launch()
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         attemptLogin(accountToken)
         ensureLoggedIn()
     }
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt
index 646af7a18e..685cff8b53 100644
--- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt
+++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LoginTest.kt
@@ -5,7 +5,7 @@ import androidx.test.uiautomator.By
 import junit.framework.Assert.assertNotNull
 import net.mullvad.mullvadvpn.test.common.constant.LOGIN_FAILURE_TIMEOUT
 import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer
-import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove
+import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 import net.mullvad.mullvadvpn.test.e2e.misc.CleanupAccountTestRule
 import org.junit.Rule
@@ -25,7 +25,7 @@ class LoginTest : EndToEndTest() {
         // When
         app.launch()
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         app.waitForLoginPrompt()
         app.attemptLogin(invalidDummyAccountToken)
 
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 ea2ae8283b..ac3997c372 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
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.test.e2e
 import androidx.test.uiautomator.By
 import net.mullvad.mullvadvpn.test.common.constant.WEB_TIMEOUT
 import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer
-import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove
+import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 import org.junit.Test
 
@@ -15,7 +15,7 @@ class WebLinkTest : EndToEndTest() {
 
         // When
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         device.findObjectWithTimeout(By.text("Login"))
         app.clickSettingsCog()
         app.clickListItemByText("FAQs & Guides")
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
index c6a9c3478a..6068ffbf4c 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.test.mockapi
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.By
 import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer
-import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove
+import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 import net.mullvad.mullvadvpn.test.mockapi.util.currentUtcTimeWithOffsetZero
 import org.junit.Test
@@ -23,7 +23,7 @@ class LoginMockApiTest : MockApiTest() {
 
         // Act
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         app.waitForLoginPrompt()
         app.attemptLogin(validAccountToken)
 
@@ -43,7 +43,7 @@ class LoginMockApiTest : MockApiTest() {
         // Act
         app.launch(endpoint)
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         app.waitForLoginPrompt()
         app.attemptLogin(validAccountToken)
 
@@ -63,7 +63,7 @@ class LoginMockApiTest : MockApiTest() {
         // Act
         app.launch(endpoint)
         device.clickAgreeOnPrivacyDisclaimer()
-        device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+        device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
         app.waitForLoginPrompt()
         app.attemptLogin(validAccountToken)