fix(android): use provider prefix to avoid conflicts other plugin pro…

…viders (apache#510) Co-authored-by: jcesarmobile <jcesarmobile@gmail.com> (cherry picked from commit eb7fc33)
DavidWiesner · Dec 7, 2021 · 442143a · 442143a
1 parent 8e43c56
commit 442143a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -61,7 +61,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

diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
@@ -344,10 +344,11 @@ public void takePicture(int returnType, int encodingType, boolean useFrontCamera
 
         // Specify file so that large image is captured and returned
         File photo = createCaptureFile(encodingType);
-        this.imageUri = new CordovaUri(FileProvider.getUriForFile(cordova.getActivity(),
-                applicationId + ".provider",
-                photo), cordova.getActivity());
-        intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, imageUri.getCorrectUri());
+        this.imageFilePath = photo.getAbsolutePath();
+        this.imageUri = FileProvider.getUriForFile(cordova.getActivity(),
+                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
         intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
 
@@ -849,7 +850,7 @@ else if (srcType == CAMERA) {
                 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 {