Merge pull request #290 from JoseExposito/master
CB-13421: (osx) Added macOS support
diff --git a/.appveyor.yml b/.appveyor.yml
index 6eea8b6..a7b2426 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,7 +16,6 @@
matrix:
- PLATFORM: windows-10-store
JUST_BUILD: --justBuild
- - PLATFORM: local\browser
install:
- npm cache clean -f
- node --version
diff --git a/.travis.yml b/.travis.yml
index 9a90443..02f9c5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,7 +75,7 @@
- node --version
- if [[ "$PLATFORM" =~ android ]]; then gradle --version; fi
- if [[ "$PLATFORM" =~ ios ]]; then npm install -g ios-deploy; fi
-- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25;
+- if [[ "$PLATFORM" =~ android ]]; then echo y | android update sdk -u --filter android-22,android-23,android-24,android-25,android-26;
fi
- git clone https://github.com/apache/cordova-paramedic /tmp/paramedic && pushd /tmp/paramedic
&& npm install && popd
diff --git a/README.md b/README.md
index f2b4562..18eccf1 100644
--- a/README.md
+++ b/README.md
@@ -76,23 +76,40 @@
### iOS Quirks
-Since iOS 10 it's mandatory to add a `NSCameraUsageDescription` and `NSPhotoLibraryUsageDescription` in the info.plist.
+Since iOS 10 it's mandatory to provide an usage description in the `info.plist` if trying to access privacy-sensitive data. When the system prompts the user to allow access, this usage description string will displayed as part of the permission dialog box, but if you didn't provide the usage description, the app will crash before showing the dialog. Also, Apple will reject apps that access private data but don't provide an usage description.
-- `NSCameraUsageDescription` describes the reason that the app accesses the user’s camera.
-- `NSPhotoLibraryUsageDescription` describes the reason the app accesses the user's photo library.
+This plugins requires the following usage descriptions:
-When the system prompts the user to allow access, this string is displayed as part of the dialog box.
+- `NSCameraUsageDescription` specifies the reason for your app to access the device's camera.
+- `NSPhotoLibraryUsageDescription` specifies the reason for your app to access the user's photo library.
+- `NSLocationWhenInUseUsageDescription` specifies the reason for your app to access the user's location information while your app is in use. (Set it if you have `CameraUsesGeolocation` preference set to `true`)
+- `NSPhotoLibraryAddUsageDescription` specifies the reason for your app to get write-only access to the user's photo library
-To add this entry you can pass the following variables on plugin install.
+To add these entries into the `info.plist`, you can use the `edit-config` tag in the `config.xml` like this:
-- `CAMERA_USAGE_DESCRIPTION` for `NSCameraUsageDescription`
-- `PHOTOLIBRARY_USAGE_DESCRIPTION` for `NSPhotoLibraryUsageDescription`
+```
+<edit-config target="NSCameraUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need camera access to take pictures</string>
+</edit-config>
+```
-Example:
+```
+<edit-config target="NSPhotoLibraryUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need to photo library access to get pictures from there</string>
+</edit-config>
+```
- cordova plugin add cordova-plugin-camera --variable CAMERA_USAGE_DESCRIPTION="your usage message" --variable PHOTOLIBRARY_USAGE_DESCRIPTION="your usage message"
+```
+<edit-config target="NSLocationWhenInUseUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need location access to find things nearby</string>
+</edit-config>
+```
-If you don't pass the variable, the plugin will add an empty string as value.
+```
+<edit-config target="NSPhotoLibraryAddUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need to photo library access to save pictures there</string>
+</edit-config>
+```
---
diff --git a/jsdoc2md/TEMPLATE.md b/jsdoc2md/TEMPLATE.md
index ba9f63a..d2e6b22 100644
--- a/jsdoc2md/TEMPLATE.md
+++ b/jsdoc2md/TEMPLATE.md
@@ -4,37 +4,54 @@
---
{{>cdv-license~}}
-|Android|iOS| Windows 8.1 Store | Windows 8.1 Phone | Windows 10 Store | Travis CI |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-store,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-phone,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-camera/)|[](https://travis-ci.org/apache/cordova-plugin-camera)
+|AppVeyor|Travis CI|
+|:-:|:-:|
+|[](https://ci.appveyor.com/project/ApacheSoftwareFoundation/cordova-plugin-camera)|[](https://travis-ci.org/apache/cordova-plugin-camera)|
# cordova-plugin-camera
This plugin defines a global `navigator.camera` object, which provides an API for taking pictures and for choosing images from
the system's image library.
-{{>cdv-header device-ready-warning-obj='navigator.camera' npmName='cordova-plugin-camera' cprName='org.apache.cordova.camera' pluginName='Plugin Camera' repoUrl='https://github.com/apache/cordova-plugin-camera' }}
+{{>cdv-header device-ready-warning-obj='navigator.camera' npmName='cordova-plugin-camera' cprName='org.apache.cordova.camera' pluginName='cordova-plugin-camera' repoUrl='https://github.com/apache/cordova-plugin-camera' }}
### iOS Quirks
-Since iOS 10 it's mandatory to add a `NSCameraUsageDescription` and `NSPhotoLibraryUsageDescription` in the info.plist.
+Since iOS 10 it's mandatory to provide an usage description in the `info.plist` if trying to access privacy-sensitive data. When the system prompts the user to allow access, this usage description string will displayed as part of the permission dialog box, but if you didn't provide the usage description, the app will crash before showing the dialog. Also, Apple will reject apps that access private data but don't provide an usage description.
-- `NSCameraUsageDescription` describes the reason that the app accesses the user’s camera.
-- `NSPhotoLibraryUsageDescription` describes the reason the app accesses the user's photo library.
+This plugins requires the following usage descriptions:
-When the system prompts the user to allow access, this string is displayed as part of the dialog box.
+- `NSCameraUsageDescription` specifies the reason for your app to access the device's camera.
+- `NSPhotoLibraryUsageDescription` specifies the reason for your app to access the user's photo library.
+- `NSLocationWhenInUseUsageDescription` specifies the reason for your app to access the user's location information while your app is in use. (Set it if you have `CameraUsesGeolocation` preference set to `true`)
+- `NSPhotoLibraryAddUsageDescription` specifies the reason for your app to get write-only access to the user's photo library
-To add this entry you can pass the following variables on plugin install.
+To add these entries into the `info.plist`, you can use the `edit-config` tag in the `config.xml` like this:
-- `CAMERA_USAGE_DESCRIPTION` for `NSCameraUsageDescription`
-- `PHOTOLIBRARY_USAGE_DESCRIPTION` for `NSPhotoLibraryUsageDescription`
+```
+<edit-config target="NSCameraUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need camera access to take pictures</string>
+</edit-config>
+```
-Example:
+```
+<edit-config target="NSPhotoLibraryUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need to photo library access to get pictures from there</string>
+</edit-config>
+```
- cordova plugin add cordova-plugin-camera --variable CAMERA_USAGE_DESCRIPTION="your usage message" --variable PHOTOLIBRARY_USAGE_DESCRIPTION="your usage message"
+```
+<edit-config target="NSLocationWhenInUseUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need location access to find things nearby</string>
+</edit-config>
+```
-If you don't pass the variable, the plugin will add an empty string as value.
+```
+<edit-config target="NSPhotoLibraryAddUsageDescription" file="*-Info.plist" mode="merge">
+ <string>need to photo library access to save pictures there</string>
+</edit-config>
+```
---
diff --git a/package.json b/package.json
index 02975ad..3412d18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-camera",
- "version": "2.4.2-dev",
+ "version": "3.0.0-dev",
"description": "Cordova Camera Plugin",
"types": "./types/index.d.ts",
"cordova": {
@@ -55,6 +55,9 @@
"engines": {
"cordovaDependencies": {
"3.0.0": {
+ "cordova-android": ">=6.3.0"
+ },
+ "4.0.0": {
"cordova": ">100"
}
}
diff --git a/plugin.xml b/plugin.xml
index 375ba88..0e970b7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,7 +22,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:rim="http://www.blackberry.com/ns/widgets"
id="cordova-plugin-camera"
- version="2.4.2-dev">
+ version="3.0.0-dev">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
@@ -30,7 +30,9 @@
<repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
<issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
- <dependency id="cordova-plugin-compat" version="^1.1.0" />
+ <engines>
+ <engine name="cordova-android" version=">=6.3.0" />
+ </engines>
<js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera" />
@@ -165,20 +167,6 @@
<framework src="CoreGraphics.framework" />
<framework src="AVFoundation.framework" />
- <preference name="CAMERA_USAGE_DESCRIPTION" default=" " />
- <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
- <string>$CAMERA_USAGE_DESCRIPTION</string>
- </config-file>
-
- <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" " />
- <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
- <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
- </config-file>
-
- <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
- <string></string>
- </config-file>
-
</platform>
<!-- blackberry10 -->
