Преглед на файлове

Merge pull request #301 from 1uokun/master

Solve the conflict between FileProvider and other libraries
Travis Nuttall преди 4 години
родител
ревизия
9425ccbd97
No account linked to committer's email address
променени са 2 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 2
    2
      android/src/main/AndroidManifest.xml
  2. 4
    0
      android/src/main/java/com/RNFetchBlob/Utils/FileProvider.java

+ 2
- 2
android/src/main/AndroidManifest.xml Целия файл

24
     <application android:label="@string/app_name">
24
     <application android:label="@string/app_name">
25
 
25
 
26
         <provider
26
         <provider
27
-            android:name="androidx.core.content.FileProvider"
27
+            android:name="com.RNFetchBlob.Utils.FileProvider"
28
             android:authorities="${applicationId}.provider"
28
             android:authorities="${applicationId}.provider"
29
             android:exported="false"
29
             android:exported="false"
30
             android:grantUriPermissions="true">
30
             android:grantUriPermissions="true">
34
         </provider>
34
         </provider>
35
     </application>
35
     </application>
36
 
36
 
37
-</manifest>
37
+</manifest>

+ 4
- 0
android/src/main/java/com/RNFetchBlob/Utils/FileProvider.java Целия файл

1
+package com.RNFetchBlob.Utils;
2
+
3
+public class FileProvider extends androidx.core.content.FileProvider {
4
+}