diff options
| -rw-r--r-- | android/app/lint-baseline.xml | 31 | ||||
| -rw-r--r-- | android/app/src/debug/AndroidManifest.xml | 8 | ||||
| -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 |
4 files changed, 27 insertions, 37 deletions
diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml index 9b9d02fcc8..f176afcc1c 100644 --- a/android/app/lint-baseline.xml +++ b/android/app/lint-baseline.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<issues format="6" by="lint 8.0.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.2)" variant="all" version="8.0.2"> - +<issues format="6" by="lint 8.1.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0)" variant="all" version="8.1.0"> <issue id="MissingSuperCall" @@ -9,40 +8,18 @@ errorLine2=" ~~~~~~~~~~~~~~~~"> <location file="src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt" - line="139" + line="134" column="18"/> </issue> <issue - id="ScopedStorage" - message="READ_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+. If you need to query or interact with MediaStore or media files on the shared storage, you should instead use one or more new storage permissions: `READ_MEDIA_IMAGES`, `READ_MEDIA_VIDEO` or `READ_MEDIA_AUDIO`." - errorLine1=" <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/debug/AndroidManifest.xml" - line="4" - column="36"/> - </issue> - - <issue - id="ScopedStorage" - message="WRITE_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+. If you need to write to shared storage, use the `MediaStore.createWriteRequest` intent." - errorLine1=" <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="src/debug/AndroidManifest.xml" - line="5" - column="36"/> - </issue> - - <issue id="InlinedApi" message="Field requires API level 33 (current min is 26): `android.Manifest.permission#POST_NOTIFICATIONS`" errorLine1=" requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt" - line="359" + line="357" column="58"/> </issue> @@ -53,7 +30,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> <location file="src/debug/AndroidManifest.xml" - line="17" + line="21" column="13"/> </issue> diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index ff2d7e28a0..a4433cfca1 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,7 +1,11 @@ <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" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <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" /> <application android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" android:theme="@style/AppTheme" 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 |