From cfefa53272d48c0067bd4a71345f1d6b328ff96f Mon Sep 17 00:00:00 2001
From: Connor Pearson <cpearson@b2wsoftware.com>
Date: Fri, 30 Jun 2017 09:59:27 -0400
Subject: [PATCH] CB-12593: (android) Fix potential FileProvider conflicts
---
plugin.xml | 7 ++++---
src/android/FileProvider.java | 21 +++++++++++++++++++
...er_paths.xml => camera_provider_paths.xml} | 0
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 src/android/FileProvider.java
rename src/android/xml/{provider_paths.xml => camera_provider_paths.xml} (100%)
diff --git a/plugin.xml b/plugin.xml
index c666ed2..607f03e 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -71,13 +71,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>
@@ -85,7 +85,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" />
diff --git a/src/android/FileProvider.java b/src/android/FileProvider.java
new file mode 100644
index 0000000..336f93c
--- /dev/null
+++ b/src/android/FileProvider.java
@@ -0,0 +1,21 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+package org.apache.cordova.camera;
+
+public class FileProvider extends android.support.v4.content.FileProvider {}
diff --git a/src/android/xml/provider_paths.xml b/src/android/xml/camera_provider_paths.xml
similarity index 100%
rename from src/android/xml/provider_paths.xml
rename to src/android/xml/camera_provider_paths.xml