diff options
| author | saber safavi <saber.safavi@codic.se> | 2023-10-05 10:12:23 +0200 |
|---|---|---|
| committer | saber safavi <saber.safavi@codic.se> | 2023-12-13 13:07:56 +0100 |
| commit | db99a389c8d4a7dad7a05f904d86c2cc7dff964a (patch) | |
| tree | c1a30d9ae1b18e7cbbe533b7ee55a367a6861ccd /android/test | |
| parent | 5d65e4828385f669a498f4e0605850237c5d93d7 (diff) | |
| download | mullvadvpn-db99a389c8d4a7dad7a05f904d86c2cc7dff964a.tar.xz mullvadvpn-db99a389c8d4a7dad7a05f904d86c2cc7dff964a.zip | |
Replace EXTERNAL_STORAGE permissions on android api level 33+
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/e2e/src/main/AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt | 13 |
2 files changed, 17 insertions, 8 deletions
diff --git a/android/test/e2e/src/main/AndroidManifest.xml b/android/test/e2e/src/main/AndroidManifest.xml index 9ba07f4905..4733444959 100644 --- a/android/test/e2e/src/main/AndroidManifest.xml +++ b/android/test/e2e/src/main/AndroidManifest.xml @@ -1,8 +1,12 @@ -<manifest xmlns:android="http://schemas.android.com/apk/res/android"> - - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" + tools:remove="android:maxSdkVersion" + tools:ignore="ScopedStorage" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" + tools:remove="android:maxSdkVersion" + tools:ignore="ScopedStorage" /> <uses-permission android:name="android.permission.INTERNET" /> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" 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 3514405dd9..e18690a385 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 @@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.test.e2e import android.Manifest import android.content.Context +import android.os.Build import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import androidx.test.runner.AndroidJUnit4 @@ -24,10 +25,14 @@ abstract class EndToEndTest { @Rule @JvmField val permissionRule: GrantPermissionRule = - GrantPermissionRule.grant( - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE - ) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + GrantPermissionRule.grant(Manifest.permission.READ_MEDIA_IMAGES) + } else { + GrantPermissionRule.grant( + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE + ) + } lateinit var device: UiDevice lateinit var targetContext: Context |