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/app | |
| parent | 5d65e4828385f669a498f4e0605850237c5d93d7 (diff) | |
| download | mullvadvpn-db99a389c8d4a7dad7a05f904d86c2cc7dff964a.tar.xz mullvadvpn-db99a389c8d4a7dad7a05f904d86c2cc7dff964a.zip | |
Replace EXTERNAL_STORAGE permissions on android api level 33+
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/lint-baseline.xml | 31 | ||||
| -rw-r--r-- | android/app/src/debug/AndroidManifest.xml | 8 |
2 files changed, 10 insertions, 29 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" |