diff options
| author | Albin <albin@mullvad.net> | 2023-11-27 18:40:56 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-11-27 18:46:51 +0100 |
| commit | 130619067f4dcb614d0bc26470d7b959a78c22b6 (patch) | |
| tree | 156467d306570a0b3aef42b48d101542135652ce | |
| parent | d7d295a90f7061898fa77101192676b6d5ae72c1 (diff) | |
| download | mullvadvpn-130619067f4dcb614d0bc26470d7b959a78c22b6.tar.xz mullvadvpn-130619067f4dcb614d0bc26470d7b959a78c22b6.zip | |
Fix conflicting file provider between build variants
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/provider/MullvadFileProvider.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8998ff7d7c..feba1dabf8 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -91,7 +91,7 @@ </intent-filter> </service> <provider android:name="net.mullvad.mullvadvpn.provider.MullvadFileProvider" - android:authorities="net.mullvad.mullvadvpn.FileProvider" + android:authorities="${applicationId}.FileProvider" android:exported="false" android:grantUriPermissions="true"> <meta-data android:name="android.support.FILE_PROVIDER_PATHS" diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/provider/MullvadFileProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/provider/MullvadFileProvider.kt index c9e7bbe214..0410117366 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/provider/MullvadFileProvider.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/provider/MullvadFileProvider.kt @@ -15,7 +15,7 @@ import org.joda.time.format.ISODateTimeFormat class MullvadFileProvider : FileProvider(R.xml.provider_paths) { companion object { fun uriForFile(context: Context, file: File): Uri { - return getUriForFile(context, "net.mullvad.mullvadvpn.FileProvider", file) + return getUriForFile(context, "${context.packageName}.FileProvider", file) } } } |