github/cordova-plugin-camera
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2026-02-03 00:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #275 from cjpearson/CB12953

Browse Source 
CB-12593: (android) Fix potential FileProvider conflicts
This commit is contained in:
Joe Bowser
2018-03-14 12:44:35 -07:00
committed by GitHub
parent e36482c7ba cfefa53272
commit c8581ba2c9
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugin.xml
View File

@@ -60,13 +60,13 @@
</config-file>
<config-file target="AndroidManifest.xml" parent="application">
<provider
android:name="android.support.v4.content.FileProvider"
android:name="org.apache.cordova.camera.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true" >
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
android:resource="@xml/camera_provider_paths"/>
</provider>
</config-file>
@@ -74,7 +74,8 @@
<source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml" />
<source-file src="src/android/FileProvider.java" target-dir="src/org/apache/cordova/camera" />
<source-file src="src/android/xml/camera_provider_paths.xml" target-dir="res/xml" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />