Merge pull request #301 from 1uokun/master

Solve the conflict between FileProvider and other libraries
joltup · Jul 14, 2019 · 9425ccb · 9425ccb
2 parents fb9e007 + aee85fb
commit 9425ccb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
     <application android:label="@string/app_name">
 
         <provider
-            android:name="androidx.core.content.FileProvider"
+            android:name="com.RNFetchBlob.Utils.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -34,4 +34,4 @@
         </provider>
     </application>
 
-</manifest>
+</manifest>
diff --git a/android/src/main/java/com/RNFetchBlob/Utils/FileProvider.java b/android/src/main/java/com/RNFetchBlob/Utils/FileProvider.java
@@ -0,0 +1,4 @@
+package com.RNFetchBlob.Utils;
+
+public class FileProvider extends androidx.core.content.FileProvider {
+}