Merge pull request react-native-image-picker#571 from rigdern/rigdern…

…/fileprovider-conflict Avoid conflicting with other FileProviders
nfl · Feb 21, 2018 · 60169dc · 60169dc
2 parents 003b8f8 + 48e8683
commit 60169dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ yarn.lock
 
 ## Android iml
 *.iml
+
+.vscode/
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
   >
     <application>
       <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="com.imagepicker.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/android/src/main/java/com/imagepicker/FileProvider.java b/android/src/main/java/com/imagepicker/FileProvider.java
@@ -0,0 +1,4 @@
+package com.imagepicker;
+
+public class FileProvider extends android.support.v4.content.FileProvider {
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ yarn.lock

		## Android iml
		*.iml

		.vscode/