Merge branch 'conflicting-provider-between-build-variants-droid-543'

mullvad · Nov 27, 2023 · f976843 · f976843
2 parents d7d295a + 1306190
commit f976843
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)
         }
     }
 }