You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by jc...@apache.org on 2020/07/16 11:08:51 UTC
[cordova-plugin-camera] branch master updated: fix(android): use
provider prefix to avoid conflicts other plugin providers (#510)
This is an automated email from the ASF dual-hosted git repository.
jcesarmobile pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-camera.git
The following commit(s) were added to refs/heads/master by this push:
new eb7fc33 fix(android): use provider prefix to avoid conflicts other plugin providers (#510)
eb7fc33 is described below
commit eb7fc333eee88446f4f74aff87f0a10ab36e295f
Author: Loïc Le Malliaud <31...@users.noreply.github.com>
AuthorDate: Thu Jul 16 13:08:40 2020 +0200
fix(android): use provider prefix to avoid conflicts other plugin providers (#510)
Co-authored-by: jcesarmobile <jc...@gmail.com>
---
plugin.xml | 8 ++++----
src/android/CameraLauncher.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 703f9d8..10cc0d0 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -59,7 +59,7 @@
<config-file target="AndroidManifest.xml" parent="application">
<provider
android:name="org.apache.cordova.camera.FileProvider"
- android:authorities="${applicationId}.provider"
+ android:authorities="${applicationId}.cordova.plugin.camera.provider"
android:exported="false"
android:grantUriPermissions="true" >
<meta-data
@@ -150,12 +150,12 @@
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
</js-module>
-
+
<header-file src="src/osx/CDVCamera.h" />
<source-file src="src/osx/CDVCamera.m" />
-
+
<framework src="Quartz.framework" />
<framework src="AppKit.framework" />
</platform>
-
+
</plugin>
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index d28aaa5..b9f5b71 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -294,7 +294,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
File photo = createCaptureFile(encodingType);
this.imageFilePath = photo.getAbsolutePath();
this.imageUri = FileProvider.getUriForFile(cordova.getActivity(),
- applicationId + ".provider",
+ applicationId + ".cordova.plugin.camera.provider",
photo);
intent.putExtra(MediaStore.EXTRA_OUTPUT, imageUri);
//We can write to this URI, this will hopefully allow us to write files to get to the next step
@@ -795,7 +795,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
try {
if (this.allowEdit) {
Uri tmpFile = FileProvider.getUriForFile(cordova.getActivity(),
- applicationId + ".provider",
+ applicationId + ".cordova.plugin.camera.provider",
createCaptureFile(this.encodingType));
performCrop(tmpFile, destType, intent);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org