Skip to content

Commit 60169dc

Browse files
authored
Merge pull request react-native-image-picker#571 from rigdern/rigdern/fileprovider-conflict
Avoid conflicting with other FileProviders
2 parents 003b8f8 + 48e8683 commit 60169dc

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ yarn.lock
3737

3838
## Android iml
3939
*.iml
40+
41+
.vscode/

android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>
66
<application>
77
<provider
8-
android:name="android.support.v4.content.FileProvider"
8+
android:name="com.imagepicker.FileProvider"
99
android:authorities="${applicationId}.provider"
1010
android:exported="false"
1111
android:grantUriPermissions="true">
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.imagepicker;
2+
3+
public class FileProvider extends android.support.v4.content.FileProvider {
4+
}

0 commit comments

Comments
 (0)