CB-10820 Updated version and RELEASENOTES.md for release 2.1.1

CB-10825 android: Always request READ permission for gallery source
This closes #191
2026-02-03 00:06:46 +08:00 · 2016-03-09 22:11:36 -05:00 · 2016-03-09 17:56:20 -08:00 · 2016-03-08 22:21:47 -05:00 · 2016-03-03 15:21:40 -08:00 · 2016-03-02 14:15:01 -08:00
27 changed files with 1659 additions and 197 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -0,0 +1,16 @@
+{
+    "browser": true
+  , "devel": true
+  , "bitwise": true
+  , "undef": true
+  , "trailing": true
+  , "quotmark": false
+  , "indent": 4
+  , "unused": "vars"
+  , "latedef": "nofunc"
+  , "globals": {
+        "module": false,
+        "exports": false,
+        "require": false
+    }
+}
--- a/.ratignore
+++ b/.ratignore
@@ -0,0 +1 @@
+TEMPLATE.md
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+sudo: false
+node_js:
+  - "4.2"
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@
 #         under the License.
 -->

+[![Build Status](https://travis-ci.org/apache/cordova-plugin-camera.svg?branch=master)](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
@@ -71,20 +73,20 @@ Documentation consists of template and API docs produced from the plugin JS code


 * [camera](#module_camera)
-  * [.getPicture(successCallback, errorCallback, options)](#module_camera.getPicture)
-  * [.cleanup()](#module_camera.cleanup)
-  * [.onError](#module_camera.onError) : <code>function</code>
-  * [.onSuccess](#module_camera.onSuccess) : <code>function</code>
-  * [.CameraOptions](#module_camera.CameraOptions) : <code>Object</code>
+    * [.getPicture(successCallback, errorCallback, options)](#module_camera.getPicture)
+    * [.cleanup()](#module_camera.cleanup)
+    * [.onError](#module_camera.onError) : <code>function</code>
+    * [.onSuccess](#module_camera.onSuccess) : <code>function</code>
+    * [.CameraOptions](#module_camera.CameraOptions) : <code>Object</code>


 * [Camera](#module_Camera)
-  * [.DestinationType](#module_Camera.DestinationType) : <code>enum</code>
-  * [.EncodingType](#module_Camera.EncodingType) : <code>enum</code>
-  * [.MediaType](#module_Camera.MediaType) : <code>enum</code>
-  * [.PictureSourceType](#module_Camera.PictureSourceType) : <code>enum</code>
-  * [.PopoverArrowDirection](#module_Camera.PopoverArrowDirection) : <code>enum</code>
-  * [.Direction](#module_Camera.Direction) : <code>enum</code>
+    * [.DestinationType](#module_Camera.DestinationType) : <code>enum</code>
+    * [.EncodingType](#module_Camera.EncodingType) : <code>enum</code>
+    * [.MediaType](#module_Camera.MediaType) : <code>enum</code>
+    * [.PictureSourceType](#module_Camera.PictureSourceType) : <code>enum</code>
+    * [.PopoverArrowDirection](#module_Camera.PopoverArrowDirection) : <code>enum</code>
+    * [.Direction](#module_Camera.Direction) : <code>enum</code>

 * [CameraPopoverHandle](#module_CameraPopoverHandle)
 * [CameraPopoverOptions](#module_CameraPopoverOptions)
@@ -97,11 +99,11 @@ Documentation consists of template and API docs produced from the plugin JS code
 ### camera.getPicture(successCallback, errorCallback, options)
 Takes a photo using the camera, or retrieves a photo from the device's
 image gallery.  The image is passed to the success callback as a
-base64-encoded `String`, or as the URI for the image file.  
+Base64-encoded `String`, or as the URI for the image file.

 The `camera.getPicture` function opens the device's default camera
 application that allows users to snap pictures by default - this behavior occurs,
-when `Camera.sourceType` equals [`Camera.PictureSourceType.CAMERA`](#module_Camera.PictureSourceType).  
+when `Camera.sourceType` equals [`Camera.PictureSourceType.CAMERA`](#module_Camera.PictureSourceType).
 Once the user snaps the photo, the camera application closes and the application is restored.

 If `Camera.sourceType` is `Camera.PictureSourceType.PHOTOLIBRARY` or
@@ -115,7 +117,7 @@ The return value is sent to the [`cameraSuccess`](#module_camera.onSuccess) call
 one of the following formats, depending on the specified
 `cameraOptions`:

- A `String` containing the base64-encoded photo image.
+- A `String` containing the Base64-encoded photo image.

 - A `String` representing the image file location on local storage (default).

@@ -136,11 +138,17 @@ than `DATA_URL`.

 __Supported Platforms__

-![](doc/img/android-success.png) ![](doc/img/blackberry-success.png) ![](doc/img/browser-success.png) ![](doc/img/firefox-success.png) ![](doc/img/fireos-success.png) ![](doc/img/ios-success.png) ![](doc/img/windows-success.png) ![](doc/img/wp8-success.png) ![](doc/img/ubuntu-success.png)
+- Android
+- BlackBerry
+- Browser
+- Firefox
+- FireOS
+- iOS
+- Windows
+- WP8
+- Ubuntu

-* [More examples](#camera-getPicture-examples)
-
-* [Quirks](#camera-getPicture-quirks)
+More examples [here](#camera-getPicture-examples). Quirks [here](#camera-getPicture-quirks).

 **Kind**: static method of <code>[camera](#module_camera)</code>  

@@ -163,7 +171,7 @@ after calling [`camera.getPicture`](#module_camera.getPicture). Applies only whe

 __Supported Platforms__

-![](doc/img/android-fail.png) ![](doc/img/blackberry-fail.png) ![](doc/img/browser-fail.png) ![](doc/img/firefox-fail.png) ![](doc/img/fireos-fail.png) ![](doc/img/ios-success.png) ![](doc/img/windows-fail.png) ![](doc/img/wp8-fail.png) ![](doc/img/ubuntu-fail.png)
+- iOS

 **Kind**: static method of <code>[camera](#module_camera)</code>  
 **Example**  
@@ -331,12 +339,12 @@ A handle to an image picker popover.

 __Supported Platforms__

-![](doc/img/android-fail.png) ![](doc/img/blackberry-fail.png) ![](doc/img/browser-fail.png) ![](doc/img/firefox-fail.png) ![](doc/img/fireos-fail.png) ![](doc/img/ios-success.png) ![](doc/img/windows-fail.png) ![](doc/img/wp8-fail.png) ![](doc/img/ubuntu-fail.png)
+- iOS

 **Example**  
 ```js
 var cameraPopoverHandle = navigator.camera.getPicture(onSuccess, onFail,
-{ 
+{
    destinationType: Camera.DestinationType.FILE_URI,
    sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
    popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY)
@@ -355,7 +363,7 @@ window.onorientationchange = function() {

 #### Example <a name="camera-getPicture-examples"></a>

-Take a photo and retrieve it as a base64-encoded image:
+Take a photo and retrieve it as a Base64-encoded image:

    navigator.camera.getPicture(onSuccess, onFail, { quality: 50,
        destinationType: Camera.DestinationType.DATA_URL
@@ -394,14 +402,14 @@ Take a photo and retrieve the image's file location:

 Amazon Fire OS uses intents to launch the camera activity on the device to capture
 images, and on phones with low memory, the Cordova activity may be killed.  In this
-scenario, the image may not appear when the cordova activity is restored.
+scenario, the image may not appear when the Cordova activity is restored.

 #### Android Quirks

 Android uses intents to launch the camera activity on the device to capture
 images, and on phones with low memory, the Cordova activity may be killed.  In this
 scenario, the result from the plugin call will be delivered via the resume event.
-See [the Android Lifecycle guide](http://cordova.apache.org/docs/en/dev/guide/platforms/android/lifecycle.html)
+See [the Android Lifecycle guide][android_lifecycle]
 for more information. The `pendingResult.result` value will contain the value that
 would be passed to the callbacks (either the URI/URL or an error message). Check
 the `pendingResult.pluginStatus` to determine whether or not the call was
@@ -409,11 +417,11 @@ successful.

 #### Browser Quirks

-Can only return photos as base64-encoded image.
+Can only return photos as Base64-encoded image.

 #### Firefox OS Quirks

-Camera plugin is currently implemented using [Web Activities](https://hacks.mozilla.org/2013/01/introducing-web-activities/).
+Camera plugin is currently implemented using [Web Activities][web_activities].

 #### iOS Quirks

@@ -510,7 +518,11 @@ Tizen only supports a `destinationType` of

 - Ignores the `cameraDirection` parameter.

- Ignores the `saveToPhotoAlbum` parameter.  IMPORTANT: All images taken with the wp7/8 cordova camera API are always copied to the phone's camera roll.  Depending on the user's settings, this could also mean the image is auto-uploaded to their OneDrive.  This could potentially mean the image is available to a wider audience than your app intended.  If this a blocker for your application, you will need to implement the CameraCaptureTask as documented on msdn : [http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx](http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx)
-You may also comment or up-vote the related issue in the [issue tracker](https://issues.apache.org/jira/browse/CB-2083)
+- Ignores the `saveToPhotoAlbum` parameter.  IMPORTANT: All images taken with the WP8/8 Cordova camera API are always copied to the phone's camera roll.  Depending on the user's settings, this could also mean the image is auto-uploaded to their OneDrive.  This could potentially mean the image is available to a wider audience than your app intended. If this is a blocker for your application, you will need to implement the CameraCaptureTask as [documented on MSDN][msdn_wp8_docs]. You may also comment or up-vote the related issue in the [issue tracker][wp8_bug].

 - Ignores the `mediaType` property of `cameraOptions` as the Windows Phone SDK does not provide a way to choose videos from PHOTOLIBRARY.
+
+[android_lifecycle]: http://cordova.apache.org/docs/en/dev/guide/platforms/android/lifecycle.html
+[web_activities]: https://hacks.mozilla.org/2013/01/introducing-web-activities/
+[wp8_bug]: https://issues.apache.org/jira/browse/CB-2083
+[msdn_wp8_docs]: http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,39 @@
 -->
 # Release Notes

+### 2.1.1 (Mar 09, 2016)
+* [CB-10825](https://issues.apache.org/jira/browse/CB-10825) android: Always request READ permission for gallery source
+* added apache license header to appium files
+* [CB-10720](https://issues.apache.org/jira/browse/CB-10720) Fixed spelling, capitalization, and other small issues.
+* [CB-10414](https://issues.apache.org/jira/browse/CB-10414) Adding focus handler to resume video when user comes back on leaving the app while preview was running
+* Appium tests: adjust swipe distance on ** Android **
+* [CB-10750](https://issues.apache.org/jira/browse/CB-10750) Appium tests: fail fast if session is irrecoverable
+* Adding missing semi colon
+* Adding focus handler to make sure filepicker gets launched when app is active on ** Windows **
+* [CB-10128](https://issues.apache.org/jira/browse/CB-10128) **iOS** Fixed how checks access authorization to camera & library. This closes #146
+* [CB-10636](https://issues.apache.org/jira/browse/CB-10636) Add JSHint for plugins
+* [CB-10639](https://issues.apache.org/jira/browse/CB-10639) Appium tests: Added some timeouts, Taking a screenshot on failure, Retry taking a picture up to 3 times, Try to restart the Appium session if it's lost
+* [CB-10552](https://issues.apache.org/jira/browse/CB-10552) Replacing images in README.md.
+* Added a lot of more cases to get the real path on ** Android ** 
+* [CB-10625](https://issues.apache.org/jira/browse/CB-10625) ** Android ** getPicture fails when getting a photo from the Photo Library - Google Photos
+* [CB-10619](https://issues.apache.org/jira/browse/CB-10619) Appium tests: Properly switch to webview on ** Android **
+* [CB-10397](https://issues.apache.org/jira/browse/CB-10397) Added Appium tests
+* [CB-10576](https://issues.apache.org/jira/browse/CB-10576) MobileSpec can't get results for **Windows**-Store 8.1 Builds
+* chore: edit package.json license to match SPDX id
+* [CB-10539](https://issues.apache.org/jira/browse/CB-10539) Commenting out the verySmallQvga maxResolution option on ** Windows **
+* [CB-10541](https://issues.apache.org/jira/browse/CB-10541) Changing default maxResoltion to be highestAvailable for CameraCaptureUI on ** Windows **
+* [CB-10113](https://issues.apache.org/jira/browse/CB-10113) ** Browser ** - Layer camera UI on top of all! 
+* [CB-10502](https://issues.apache.org/jira/browse/CB-10502) ** Browser ** - Fix camera plugin exception in Chrome when click capture.
+* Adding comments
+* Camera tapping fix on ** Windows **
+
+### 2.1.0 (Jan 15, 2016)
+* added `.ratignore`
+* CB-10319 **Android** Adding reflective helper methods for permission requests
+* CB-9189 **Android** Implementing `save/restore` API to handle Activity destruction
+* CB-10241 App Crash cause by Camera Plugin **iOS 7**
+* CB-8940 Setting `z-index` values to maximum for UI buttons.
+
 ### 2.0.0 (Nov 18, 2015)
 * [CB-10035](https://issues.apache.org/jira/browse/CB-10035) Updated `RELEASENOTES` to be newest to oldest
 * [CB-8863](https://issues.apache.org/jira/browse/CB-8863) correct block usage for `async` calls
--- a/appium-tests/android/android.spec.js
+++ b/appium-tests/android/android.spec.js
@@ -0,0 +1,592 @@
+/*jshint node: true, jasmine: true */
+/*
+ *
+ * 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.
+ *
+*/
+
+// these tests are meant to be executed by Cordova Medic Appium runner
+// you can find it here: https://github.com/apache/cordova-medic/
+// it is not necessary to do a full CI setup to run these tests
+// just run "node cordova-medic/medic/medic.js appium --platform android --plugins cordova-plugin-camera"
+
+'use strict';
+
+var wdHelper = require('../helpers/wdHelper');
+var wd = wdHelper.getWD();
+var cameraConstants = require('../../www/CameraConstants');
+var cameraHelper = require('../helpers/cameraHelper');
+var screenshotHelper = require('../helpers/screenshotHelper');
+
+var STARTING_MESSAGE = 'Ready for action!';
+var RETRY_COUNT = 3; // how many times to retry taking a picture before failing
+var MINUTE = 60 * 1000;
+var DEFAULT_SCREEN_WIDTH = 360;
+var DEFAULT_SCREEN_HEIGHT = 567;
+var DEFAULT_WEBVIEW_CONTEXT = 'WEBVIEW';
+
+describe('Camera tests Android.', function () {
+    var driver;
+    // the name of webview context, it will be changed to match needed context if there are named ones:
+    var webviewContext = DEFAULT_WEBVIEW_CONTEXT;
+    // this indicates that the device library has the test picture:
+    var isTestPictureSaved = false;
+    // this indicates that there was a critical error and we should try to recover:
+    var errorFlag = false;
+    // this indicates that we couldn't restore Appium session and should fail fast:
+    var stopFlag = false;
+    // we need to know the screen width and height to properly click on an image in the gallery:
+    var screenWidth = DEFAULT_SCREEN_WIDTH;
+    var screenHeight = DEFAULT_SCREEN_HEIGHT;
+
+    function win() {
+        expect(true).toBe(true);
+    }
+
+    function fail(error) {
+        screenshotHelper.saveScreenshot(driver);
+        if (error && error.message) {
+            console.log('An error occured: ' + error.message);
+            expect(true).toFailWithMessage(error.message);
+            throw error.message;
+        }
+        if (error) {
+            console.log('Failed expectation: ' + error);
+            expect(true).toFailWithMessage(error);
+            throw error;
+        }
+        // no message provided :(
+        expect(true).toBe(false);
+        throw 'An error without description occured';
+    }
+
+    // generates test specs by combining all the specified options
+    // you can add more options to test more scenarios
+    function generateSpecs() {
+        var sourceTypes = [
+                cameraConstants.PictureSourceType.CAMERA,
+                cameraConstants.PictureSourceType.PHOTOLIBRARY
+            ],
+            destinationTypes = cameraConstants.DestinationType,
+            encodingTypes = [
+                cameraConstants.EncodingType.JPEG,
+                cameraConstants.EncodingType.PNG
+            ],
+            allowEditOptions = [
+                true,
+                false
+            ];
+
+        return cameraHelper.generateSpecs(sourceTypes, destinationTypes, encodingTypes, allowEditOptions);
+    }
+
+    function getPicture(options, skipUiInteractions, retry) {
+        if (!options) {
+            options = {};
+        }
+        if (typeof retry === 'undefined') {
+            retry = 1;
+        }
+
+        var command = "navigator.camera.getPicture(function (result) { document.getElementById('info').innerHTML = result.slice(0, 100); }, " +
+                      "function (err) { document.getElementById('info').innerHTML = 'ERROR: ' + err; }," + JSON.stringify(options) + ");";
+        return driver
+            .context(webviewContext)
+            .execute(command)
+            .sleep(7000)
+            .context('NATIVE_APP')
+            .sleep(5000)
+            .then(function () {
+                if (skipUiInteractions) {
+                    return;
+                }
+                if (options.hasOwnProperty('sourceType') &&
+                        (options.sourceType === cameraConstants.PictureSourceType.PHOTOLIBRARY ||
+                        options.sourceType === cameraConstants.PictureSourceType.SAVEDPHOTOALBUM)) {
+                    var touchTile = new wd.TouchAction(),
+                        swipeRight = new wd.TouchAction();
+                    touchTile.press({x: Math.round(screenWidth / 4), y: Math.round(screenHeight / 5)}).release();
+                    swipeRight.press({x: 10, y: Math.round(screenHeight * 0.8)})
+                        .wait(300)
+                        .moveTo({x: Math.round(screenWidth / 2), y: Math.round(screenHeight / 2)})
+                        .release();
+                    return driver
+                        .performTouchAction(swipeRight)
+                        .sleep(3000)
+                        .elementByXPath('//*[@text="Gallery"]')
+                        .then(function (element) {
+                            return element.click().sleep(5000);
+                        }, function () {
+                            // if the gallery is already opened, we'd just go on:
+                            return driver;
+                        })
+                        .performTouchAction(touchTile);
+                }
+                return driver
+                    .elementByXPath('//android.widget.ImageView[contains(@resource-id,\'shutter\')]')
+                    .click()
+                    .sleep(3000)
+                    .elementByXPath('//android.widget.ImageView[contains(@resource-id,\'done\')]')
+                    .click()
+                    .sleep(10000);
+            })
+            .then(function () {
+                if (skipUiInteractions) {
+                    return;
+                }
+                if (options.hasOwnProperty('allowEdit') && options.allowEdit === true) {
+                    return driver
+                        .elementByXPath('//*[contains(@resource-id,\'save\')]')
+                        .click();
+                }
+            })
+            .then(function () {
+                if (!skipUiInteractions) {
+                    return driver.sleep(10000);
+                }
+            })
+            .fail(function (error) {
+                if (retry < RETRY_COUNT) {
+                    console.log('Failed to get a picture. Let\'s try it again... ');
+                    return getPicture(options, skipUiInteractions, ++retry);
+                } else {
+                    console.log('Tried ' + RETRY_COUNT + ' times but couldn\'t get the picture. Failing...');
+                    fail(error);
+                }
+            });
+    }
+
+    function enterTest() {
+        return driver
+            // trying to determine where we are
+            .context(webviewContext)
+            .fail(function (error) {
+                fail(error);
+            })
+            .elementById('info')
+            .then(function () {
+                return driver; //we're already on the test screen
+            }, function () {
+                return driver
+                    .elementById('middle')
+                    .then(function () {
+                        return driver
+                            // we're on autotests page, we should go to start page
+                            .execute('window.location = "../index.html"')
+                            .sleep(5000)
+                            .fail(function () {
+                                errorFlag = true;
+                                throw 'Couldn\'t find start page.';
+                            });
+                    }, function () {
+                        return; // no-op
+                    })
+                    // unknown starting page: no 'info' div
+                    // adding it manually
+                    .execute('var info = document.createElement("div"); ' +
+                             'info.id = "info"; ' +
+                             'document.body.appendChild(info);');
+            })
+            .sleep(5000);
+    }
+
+    function checkPicture(shouldLoad) {
+        return driver
+            .context(webviewContext)
+            .elementById('info')
+            .getAttribute('innerHTML')
+            .then(function (html) {
+                if (html.indexOf(STARTING_MESSAGE) >= 0) {
+                    expect(true).toFailWithMessage('No callback was fired');
+                } else if (shouldLoad) {
+                    expect(html.length).toBeGreaterThan(0);
+                    if (html.indexOf('ERROR') >= 0) {
+                        fail(html);
+                    }
+                } else {
+                    if (html.indexOf('ERROR') === -1) {
+                        fail('Unexpected success callback with result: ' + html);
+                    }
+                    expect(html.indexOf('ERROR')).toBe(0);
+                }
+            });
+    }
+
+    function runCombinedSpec(spec) {
+        return enterTest()
+            .then(function () {
+                return getPicture(spec.options);
+            })
+            .then(function () {
+                return checkPicture(true);
+            })
+            .then(win, fail);
+    }
+
+    function deleteImage() {
+        var holdTile = new wd.TouchAction();
+        holdTile.press({x: Math.round(screenWidth / 3), y: Math.round(screenHeight / 5)}).wait(1000).release();
+        return driver
+            .performTouchAction(holdTile)
+            .elementByXPath('//android.widget.TextView[@text="Delete"]')
+            .then(function (element) {
+                return element
+                    .click()
+                    .elementByXPath('//android.widget.Button[@text="OK"]')
+                    .click();
+            }, function () {
+                // couldn't find Delete menu item. Possibly there is no image.
+                return;
+            });
+    }
+
+    function getDriver() {
+        driver = wdHelper.getDriver('Android');
+        return driver;
+    }
+
+    function checkStopFlag() {
+        if (stopFlag) {
+            fail('Something went wrong: the stopFlag is on. Please see the log for more details.');
+        }
+        return stopFlag;
+    }
+
+    beforeEach(function () {
+        jasmine.addMatchers({
+            toFailWithMessage : function () {
+                return {
+                    compare: function (actual, msg) {
+                        console.log('Failing with message: ' + msg);
+                        var result = {
+                            pass: false,
+                            message: msg
+                        };
+                        // status 6 means that we've lost the session
+                        // status 7 means that Appium couldn't find an element
+                        // both these statuses mean that the test has failed but
+                        // we should try to recreate the session for the following tests
+                        if (msg.indexOf('Error response status: 6') >= 0 ||
+                            msg.indexOf('Error response status: 7') >= 0) {
+                            errorFlag = true;
+                        }
+                        return result;
+                    }
+                };
+            }
+        });
+    });
+
+    it('camera.ui.util configuring driver and starting a session', function (done) {
+        stopFlag = true; // just in case of timeout
+        getDriver().then(function () {
+            stopFlag = false;
+        }, function (error) {
+            fail(error);
+        })
+        .finally(done);
+    }, 5 * MINUTE);
+
+    it('camera.ui.util determine webview context name', function (done) {
+        var i = 0;
+        return driver
+            .contexts(function (err, contexts) {
+                if (err) {
+                    console.log(err);
+                }
+                for (i = 0; i < contexts.length; i++) {
+                    if (contexts[i].indexOf('mobilespec') >= 0) {
+                        webviewContext = contexts[i];
+                    }
+                }
+                done();
+            });
+    }, MINUTE);
+
+    it('camera.ui.util determine screen dimensions', function (done) {
+        return enterTest()
+            .execute('document.getElementById(\'info\').innerHTML = window.innerWidth;')
+            .sleep(5000)
+            .elementById('info')
+            .getAttribute('innerHTML')
+            .then(function (html) {
+                if (html !== STARTING_MESSAGE) {
+                    screenWidth = Number(html);
+                }
+            })
+            .execute('document.getElementById(\'info\').innerHTML = \'' + STARTING_MESSAGE + '\';')
+            .execute('document.getElementById(\'info\').innerHTML = window.innerHeight;')
+            .sleep(5000)
+            .elementById('info')
+            .getAttribute('innerHTML')
+            .then(function (html) {
+                if (html !== STARTING_MESSAGE) {
+                    screenHeight = Number(html);
+                }
+                done();
+            });
+    }, MINUTE);
+
+    describe('Specs.', function () {
+        beforeEach(function (done) {
+            // prepare the app for the test
+            if (!stopFlag) {
+                return driver
+                    .context(webviewContext)
+                    .then(function () {
+                        return driver; // no-op
+                    }, function (error) {
+                        expect(true).toFailWithMessage(error);
+                    })
+                    .execute('document.getElementById("info").innerHTML = "' + STARTING_MESSAGE + '";')
+                    .finally(done);
+            }
+            done();
+        }, 3 * MINUTE);
+
+        afterEach(function (done) {
+            if (!errorFlag || stopFlag) {
+                // either there's no error or we've failed irrecoverably
+                // nothing to worry about!
+                done();
+                return;
+            }
+            // recreate the session if there was a critical error in a previous spec
+            stopFlag = true; // we're going to set this to false if we're able to restore the session
+            return driver
+                .quit()
+                .then(function () {
+                    return getDriver()
+                        .then(function () {
+                            errorFlag = false;
+                            stopFlag = false;
+                        }, function (error) {
+                            fail(error);
+                            stopFlag = true;
+                        });
+                }, function (error) {
+                    fail(error);
+                    stopFlag = true;
+                })
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // getPicture() with saveToPhotoLibrary = true
+        it('camera.ui.spec.1 Saving the picture to photo library', function (done) {
+            var options = {
+                quality: 50,
+                allowEdit: false,
+                sourceType: cameraConstants.PictureSourceType.CAMERA,
+                saveToPhotoAlbum: true
+            };
+            enterTest()
+                .context(webviewContext)
+                .then(function () {
+                    return getPicture(options);
+                })
+                .then(function () {
+                    isTestPictureSaved = true;
+                    return checkPicture(true);
+                })
+                .then(win, fail)
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // getPicture() with mediaType: VIDEO, sourceType: PHOTOLIBRARY
+        it('camera.ui.spec.2 Selecting only videos', function (done) {
+            if (checkStopFlag()) {
+                done();
+                return;
+            }
+            var options = { sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
+                            mediaType: cameraConstants.MediaType.VIDEO };
+            enterTest()
+                .then(function () {
+                    return getPicture(options, true);
+                })
+                .sleep(5000)
+                .context(webviewContext)
+                .elementById('info')
+                .getAttribute('innerHTML')
+                .then(function (html) {
+                    if (html.indexOf('ERROR') >= 0) {
+                        throw html;
+                    }
+                })
+                .context('NATIVE_APP')
+                .sleep(5000)
+                .then(function () {
+                    // try to find "Gallery" menu item
+                    // if there's none, the gallery should be already opened
+                    return driver
+                        .elementByXPath('//*[@text="Gallery"]')
+                        .then(function (element) {
+                            return element.click().sleep(2000);
+                        }, function () {
+                            return driver;
+                        });
+                })
+                .then(function () {
+                    // if the gallery is opened on the videos page,
+                    // there should be a "Choose video" caption
+                    return driver
+                        .elementByXPath('//*[@text="Choose video"]')
+                        .fail(function () {
+                            throw 'Couldn\'t find "Choose video" element.';
+                        });
+                })
+                .then(win, fail)
+                .deviceKeyEvent(4)
+                .sleep(2000)
+                .deviceKeyEvent(4)
+                .sleep(2000)
+                .elementById('action_bar_title')
+                .then(function () {
+                    // success means we're still in native app
+                    return driver
+                        .deviceKeyEvent(4)
+                        .sleep(2000);
+                }, function () {
+                    // error means we're already in webview
+                    return driver;
+                })
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // getPicture(), then dismiss
+        // wait for the error callback to bee called
+        it('camera.ui.spec.3 Dismissing the camera', function (done) {
+            if (checkStopFlag()) {
+                done();
+                return;
+            }
+            var options = { quality: 50,
+                            allowEdit: true,
+                            sourceType: cameraConstants.PictureSourceType.CAMERA,
+                            destinationType: cameraConstants.DestinationType.FILE_URI };
+            enterTest()
+                .context(webviewContext)
+                .then(function () {
+                    return getPicture(options, true);
+                })
+                .sleep(5000)
+                .context("NATIVE_APP")
+                .elementByXPath('//android.widget.ImageView[contains(@resource-id,\'cancel\')]')
+                .click()
+                .context(webviewContext)
+                .then(function () {
+                    return driver
+                        .elementByXPath('//*[contains(text(),"Camera cancelled")]')
+                        .then(function () {
+                            return checkPicture(false);
+                        }, function () {
+                            throw 'Couldn\'t find "Camera cancelled" message.';
+                        });
+                })
+                .then(win, fail)
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // getPicture(), then take picture but dismiss the edit
+        // wait for the error cllback to be called
+        it('camera.ui.spec.4 Dismissing the edit', function (done) {
+            if (checkStopFlag()) {
+                done();
+                return;
+            }
+            var options = { quality: 50,
+                            allowEdit: true,
+                            sourceType: cameraConstants.PictureSourceType.CAMERA,
+                            destinationType: cameraConstants.DestinationType.FILE_URI };
+            enterTest()
+                .context(webviewContext)
+                .then(function () {
+                    return getPicture(options, true);
+                })
+                .sleep(5000)
+                .context('NATIVE_APP')
+                .elementByXPath('//android.widget.ImageView[contains(@resource-id,\'shutter\')]')
+                .click()
+                .elementByXPath('//android.widget.ImageView[contains(@resource-id,\'done\')]')
+                .click()
+                .elementByXPath('//*[contains(@resource-id,\'discard\')]')
+                .click()
+                .sleep(5000)
+                .context(webviewContext)
+                .then(function () {
+                    return driver
+                        .elementByXPath('//*[contains(text(),"Camera cancelled")]')
+                        .then(function () {
+                            return checkPicture(false);
+                        }, function () {
+                            throw 'Couldn\'t find "Camera cancelled" message.';
+                        });
+                })
+                .then(win, fail)
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // combine various options for getPicture()
+        generateSpecs().forEach(function (spec) {
+            it('camera.ui.spec.5.' + spec.id + ' Combining options', function (done) {
+                if (checkStopFlag()) {
+                    done();
+                    return;
+                }
+                runCombinedSpec(spec).then(done);
+            }, 3 * MINUTE);
+        });
+
+
+        it('camera.ui.util Delete test image from device library', function (done) {
+            if (checkStopFlag()) {
+                done();
+                return;
+            }
+            if (isTestPictureSaved) {
+                // delete exactly one last picture
+                // this should be the picture we've taken in the first spec
+                return driver
+                    .context('NATIVE_APP')
+                    .deviceKeyEvent(3)
+                    .sleep(5000)
+                    .elementByName('Apps')
+                    .click()
+                    .elementByXPath('//android.widget.TextView[@text="Gallery"]')
+                    .click()
+                    .elementByXPath('//android.widget.TextView[contains(@text,"Pictures")]')
+                    .then(function (element) {
+                        return element
+                            .click()
+                            .sleep(3000)
+                            .then(deleteImage)
+                            .then(function () { done(); }, function () { done(); });
+                    }, function () {
+                        done();
+                    });
+            }
+            // couldn't save test picture earlier, so nothing to delete here
+            done();
+        }, 3 * MINUTE);
+
+    });
+
+    it('camera.ui.util Destroy the session', function (done) {
+        return driver.quit(done);
+    }, 10000);
+});
--- a/appium-tests/helpers/cameraHelper.js
+++ b/appium-tests/helpers/cameraHelper.js
@@ -0,0 +1,86 @@
+/*jshint node: true */
+/*
+ *
+ * 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.
+ *
+*/
+
+'use strict';
+
+var cameraConstants = require('../../www/CameraConstants');
+
+module.exports.generateSpecs = function (sourceTypes, destinationTypes, encodingTypes, allowEditOptions) {
+    var destinationType,
+        sourceType,
+        encodingType,
+        allowEdit,
+        specs = [],
+        id = 1;
+    for (destinationType in destinationTypes) {
+        if (destinationTypes.hasOwnProperty(destinationType)) {
+            for (sourceType in sourceTypes) {
+                if (sourceTypes.hasOwnProperty(sourceType)) {
+                    for (encodingType in encodingTypes) {
+                        if (encodingTypes.hasOwnProperty(encodingType)) {
+                            for (allowEdit in allowEditOptions) {
+                                if (allowEditOptions.hasOwnProperty(allowEdit)) {
+                                    // if taking picture from photolibrary, don't vary 'correctOrientation' option
+                                    if (sourceTypes[sourceType] === cameraConstants.PictureSourceType.PHOTOLIBRARY) {
+                                        specs.push({
+                                            'id': id++,
+                                            'options': {
+                                                'destinationType': destinationTypes[destinationType],
+                                                'sourceType': sourceTypes[sourceType],
+                                                'encodingType': encodingTypes[encodingType],
+                                                'allowEdit': allowEditOptions[allowEdit],
+                                                'saveToPhotoAlbum': false,
+                                            }
+                                        });
+                                    } else {
+                                        specs.push({
+                                            'id': id++,
+                                            'options': {
+                                                'destinationType': destinationTypes[destinationType],
+                                                'sourceType': sourceTypes[sourceType],
+                                                'encodingType': encodingTypes[encodingType],
+                                                'correctOrientation': true,
+                                                'allowEdit': allowEditOptions[allowEdit],
+                                                'saveToPhotoAlbum': false,
+                                            }
+                                        }, {
+                                            'id': id++,
+                                            'options': {
+                                                'destinationType': destinationTypes[destinationType],
+                                                'sourceType': sourceTypes[sourceType],
+                                                'encodingType': encodingTypes[encodingType],
+                                                'correctOrientation': false,
+                                                'allowEdit': allowEditOptions[allowEdit],
+                                                'saveToPhotoAlbum': false,
+                                            }
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return specs;
+};
--- a/appium-tests/helpers/screenshotHelper.js
+++ b/appium-tests/helpers/screenshotHelper.js
@@ -0,0 +1,58 @@
+/* jshint node: true */
+/*
+ *
+ * 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.
+ *
+*/
+
+'use strict';
+
+var path = require('path');
+var screenshotPath = global.SCREENSHOT_PATH || path.join(__dirname, '../../appium_screenshots/');
+
+function generateScreenshotName() {
+    var date = new Date();
+
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var hour = date.getHours();
+    var min = date.getMinutes();
+    var sec = date.getSeconds();
+
+    month = (month < 10 ? "0" : "") + month;
+    day = (day < 10 ? "0" : "") + day;
+    hour = (hour < 10 ? "0" : "") + hour;
+    min = (min < 10 ? "0" : "") + min;
+    sec = (sec < 10 ? "0" : "") + sec;
+
+    return date.getFullYear() + '-' + month + '-' + day + '_' +  hour + '.' + min + '.' + sec + '.png';
+}
+
+module.exports.saveScreenshot = function (driver) {
+    var oldContext;
+    return driver
+        .currentContext()
+        .then(function (cc) {
+            oldContext = cc;
+        })
+        .context('NATIVE_APP')
+        .saveScreenshot(screenshotPath + generateScreenshotName())
+        .then(function () {
+            return driver.context(oldContext);
+        });
+};
--- a/appium-tests/helpers/wdHelper.js
+++ b/appium-tests/helpers/wdHelper.js
@@ -0,0 +1,68 @@
+/* jshint node: true */
+/*
+ *
+ * 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.
+ *
+*/
+
+'use strict';
+
+var wd = global.WD || require('wd');
+var driver;
+
+module.exports.getDriver = function (platform, callback) {
+    var serverConfig = {
+        host: 'localhost',
+        port: 4723
+    },
+        driverConfig = {
+            browserName: '',
+            'appium-version': '1.5',
+            platformName: platform,
+            platformVersion: global.PLATFORM_VERSION || '',
+            deviceName: global.DEVICE_NAME || '',
+            app: global.PACKAGE_PATH,
+            autoAcceptAlerts: true,
+        };
+
+    if (process.env.CHROMEDRIVER_EXECUTABLE) {
+        driverConfig.chromedriverExecutable = process.env.CHROMEDRIVER_EXECUTABLE;
+    }
+    driver = wd.promiseChainRemote(serverConfig);
+    module.exports.configureLogging(driver);
+
+    return driver.init(driverConfig).setImplicitWaitTimeout(10000)
+        .sleep(20000) // wait for the app to load
+        .then(callback);
+};
+
+module.exports.getWD = function () {
+    return wd;
+};
+
+module.exports.configureLogging = function (driver) {
+    driver.on('status', function (info) {
+        console.log(info);
+    });
+    driver.on('command', function (meth, path, data) {
+        console.log(' > ' + meth, path, data || '');
+    });
+    driver.on('http', function (meth, path, data) {
+        console.log(' > ' + meth, path, data || '');
+    });
+};
--- a/appium-tests/ios/ios.spec.js
+++ b/appium-tests/ios/ios.spec.js
@@ -0,0 +1,288 @@
+/*jshint node: true, jasmine: true */
+/*
+ *
+ * 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.
+ *
+*/
+
+// these tests are meant to be executed by Cordova Medic Appium runner
+// you can find it here: https://github.com/apache/cordova-medic/
+// it is not necessary to do a full CI setup to run these tests
+// just run "node cordova-medic/medic/medic.js appium --platform android --plugins cordova-plugin-camera"
+
+'use strict';
+
+var wdHelper = require('../helpers/wdHelper');
+var wd = wdHelper.getWD();
+var isDevice = global.DEVICE;
+var cameraConstants = require('../../www/CameraConstants');
+var cameraHelper = require('../helpers/cameraHelper');
+var screenshotHelper = require('../helpers/screenshotHelper');
+
+var MINUTE = 60 * 1000;
+var DEFAULT_WEBVIEW_CONTEXT = 'WEBVIEW_1';
+
+describe('Camera tests iOS.', function () {
+
+    var driver;
+    var webviewContext = DEFAULT_WEBVIEW_CONTEXT;
+    var startingMessage = 'Ready for action!';
+
+    function win() {
+        expect(true).toBe(true);
+    }
+
+    function fail(error) {
+        screenshotHelper.saveScreenshot(driver);
+        if (error && error.message) {
+            console.log('An error occured: ' + error.message);
+            expect(true).toFailWithMessage(error.message);
+            throw error.message;
+        }
+        if (error) {
+            console.log('Failed expectation: ' + error);
+            expect(true).toFailWithMessage(error);
+            throw error;
+        }
+        // no message provided :(
+        expect(true).toBe(false);
+        throw 'An error without description occured';
+    }
+
+    // generates test specs by combining all the specified options
+    // you can add more options to test more scenarios
+    function generateSpecs() {
+        var sourceTypes = [
+                cameraConstants.PictureSourceType.CAMERA,
+                cameraConstants.PictureSourceType.PHOTOLIBRARY
+            ],
+            destinationTypes = cameraConstants.DestinationType,
+            encodingTypes = [
+                cameraConstants.EncodingType.JPEG,
+                cameraConstants.EncodingType.PNG
+            ],
+            allowEditOptions = [
+                true,
+                false
+            ];
+
+        return cameraHelper.generateSpecs(sourceTypes, destinationTypes, encodingTypes, allowEditOptions);
+    }
+
+    function getPicture(options, cancelCamera, skipUiInteractions) {
+        if (!options) {
+            options = {};
+        }
+        var command = "navigator.camera.getPicture(function (result) { document.getElementById('info').innerHTML = 'Success: ' + result.slice(0, 100); }, " +
+                      "function (err) { document.getElementById('info').innerHTML = 'ERROR: ' + err; }," + JSON.stringify(options) + ");";
+        return driver
+            .sleep(2000)
+            .context(webviewContext)
+            .execute(command)
+            .sleep(5000)
+            .context('NATIVE_APP')
+            .then(function () {
+                if (skipUiInteractions) {
+                    return;
+                }
+                if (options.hasOwnProperty('sourceType') && options.sourceType === cameraConstants.PictureSourceType.PHOTOLIBRARY) {
+                    return driver
+                        .elementByName('Camera Roll')
+                        .click()
+                        .elementByXPath('//UIACollectionCell')
+                        .click()
+                        .then(function () {
+                            if (options.hasOwnProperty('allowEdit') && options.allowEdit === true) {
+                                return driver
+                                    .elementByName('Use')
+                                    .click();
+                            }
+                            return driver;
+                        });
+                }
+                if (options.hasOwnProperty('sourceType') && options.sourceType === cameraConstants.PictureSourceType.SAVEDPHOTOALBUM) {
+                    return driver
+                        .elementByXPath('//UIACollectionCell')
+                        .click()
+                        .then(function () {
+                            if (options.hasOwnProperty('allowEdit') && options.allowEdit === true) {
+                                return driver
+                                    .elementByName('Use')
+                                    .click();
+                            }
+                            return driver;
+                        });
+                }
+                if (cancelCamera) {
+                    return driver
+                        .elementByName('Cancel')
+                        .click();
+                }
+                return driver
+                    .elementByName('PhotoCapture')
+                    .click()
+                    .elementByName('Use Photo')
+                    .click();
+            })
+            .sleep(3000);
+    }
+
+    function enterTest() {
+        return driver
+            .contexts(function (err, contexts) {
+                if (err) {
+                    fail(err);
+                } else {
+                    // if WEBVIEW context is available, use it
+                    // if not, use NATIVE_APP
+                    webviewContext = contexts[contexts.length - 1];
+                }
+            })
+            .then(function () {
+                return driver
+                    .context(webviewContext);
+            })
+            .fail(fail)
+            .elementById('info')
+            .fail(function () {
+                // unknown starting page: no 'info' div
+                // adding it manually
+                return driver
+                    .execute('var info = document.createElement("div"); ' +
+                             'info.id = "info"' +
+                             'document.body.appendChild(info);')
+                    .fail(fail);
+            })
+            .execute('document.getElementById("info").innerHTML = "' + startingMessage + '";')
+            .fail(fail);
+    }
+
+    function checkPicture(shouldLoad) {
+        return driver
+            .contexts(function (err, contexts) {
+                // if WEBVIEW context is available, use it
+                // if not, use NATIVE_APP
+                webviewContext = contexts[contexts.length - 1];
+            })
+            .context(webviewContext)
+            .elementById('info')
+            .getAttribute('innerHTML')
+            .then(function (html) {
+                if (html.indexOf(startingMessage) >= 0) {
+                    expect(true).toFailWithMessage('No callback was fired');
+                } else if (shouldLoad) {
+                    expect(html.length).toBeGreaterThan(0);
+                    if (html.indexOf('ERROR') >= 0) {
+                        expect(true).toFailWithMessage(html);
+                    }
+                } else {
+                    if (html.indexOf('ERROR') === -1) {
+                        expect(true).toFailWithMessage('Unexpected success callback with result: ' + html);
+                    }
+                    expect(html.indexOf('ERROR')).toBe(0);
+                }
+            })
+            .context('NATIVE_APP');
+    }
+
+    function runCombinedSpec(spec) {
+        return enterTest()
+            .then(function () {
+                return getPicture(spec.options);
+            })
+            .then(function () {
+                return checkPicture(true);
+            })
+            .then(win, fail);
+    }
+
+    beforeEach(function () {
+        jasmine.addMatchers({
+            toFailWithMessage : function () {
+                return {
+                    compare: function (actual, msg) {
+                        console.log('Failing with message: ' + msg);
+                        var result = {
+                            pass: false,
+                            message: msg
+                        };
+                        return result;
+                    }
+                };
+            }
+        });
+    });
+
+    it('camera.ui.util Configuring driver and starting a session', function (done) {
+        driver = wdHelper.getDriver('iOS', done);
+    }, 3 * MINUTE);
+
+    describe('Specs.', function () {
+        // getPicture() with mediaType: VIDEO, sourceType: PHOTOLIBRARY
+        it('camera.ui.spec.1 Selecting only videos', function (done) {
+            var options = { sourceType: cameraConstants.PictureSourceType.PHOTOLIBRARY,
+                            mediaType: cameraConstants.MediaType.VIDEO };
+            enterTest()
+                .then(function () { return getPicture(options, false, true); }) // skip ui unteractions
+                .sleep(5000)
+                .elementByName('Videos')
+                .then(win, fail)
+                .elementByName('Cancel')
+                .click()
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // getPicture(), then dismiss
+        // wait for the error callback to bee called
+        it('camera.ui.spec.2 Dismissing the camera', function (done) {
+            // camera is not available on iOS simulator
+            if (!isDevice) {
+                pending();
+            }
+            var options = { sourceType: cameraConstants.PictureSourceType.CAMERA };
+            enterTest()
+                .then(function () {
+                    return getPicture(options, true);
+                })
+                .then(function () {
+                    return checkPicture(false);
+                })
+                .elementByXPath('//UIAStaticText[contains(@label,"no image selected")]')
+                .then(function () {
+                    return checkPicture(false);
+                }, fail)
+                .finally(done);
+        }, 3 * MINUTE);
+
+        // combine various options for getPicture()
+        generateSpecs().forEach(function (spec) {
+            it('camera.ui.spec.3.' + spec.id + ' Combining options', function (done) {
+                // camera is not available on iOS simulator
+                if (!isDevice) {
+                    pending();
+                }
+                runCombinedSpec(spec).then(done);
+            }, 3 * MINUTE);
+        });
+
+    });
+
+    it('camera.ui.util.4 Destroy the session', function (done) {
+        driver.quit(done);
+    }, 10000);
+});
--- a/jsdoc2md/TEMPLATE.md
+++ b/jsdoc2md/TEMPLATE.md
@@ -1,5 +1,7 @@
 {{>cdv-license~}}

+[![Build Status](https://travis-ci.org/apache/cordova-plugin-camera.svg?branch=master)](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
@@ -32,7 +34,7 @@ the system's image library.

 #### Example <a name="camera-getPicture-examples"></a>

-Take a photo and retrieve it as a base64-encoded image:
+Take a photo and retrieve it as a Base64-encoded image:

    navigator.camera.getPicture(onSuccess, onFail, { quality: 50,
        destinationType: Camera.DestinationType.DATA_URL
@@ -71,14 +73,14 @@ Take a photo and retrieve the image's file location:

 Amazon Fire OS uses intents to launch the camera activity on the device to capture
 images, and on phones with low memory, the Cordova activity may be killed.  In this
-scenario, the image may not appear when the cordova activity is restored.
+scenario, the image may not appear when the Cordova activity is restored.

 #### Android Quirks

 Android uses intents to launch the camera activity on the device to capture
 images, and on phones with low memory, the Cordova activity may be killed.  In this
 scenario, the result from the plugin call will be delivered via the resume event.
-See [the Android Lifecycle guide](http://cordova.apache.org/docs/en/dev/guide/platforms/android/lifecycle.html)
+See [the Android Lifecycle guide][android_lifecycle]
 for more information. The `pendingResult.result` value will contain the value that
 would be passed to the callbacks (either the URI/URL or an error message). Check
 the `pendingResult.pluginStatus` to determine whether or not the call was
@@ -86,11 +88,11 @@ successful.

 #### Browser Quirks

-Can only return photos as base64-encoded image.
+Can only return photos as Base64-encoded image.

 #### Firefox OS Quirks

-Camera plugin is currently implemented using [Web Activities](https://hacks.mozilla.org/2013/01/introducing-web-activities/).
+Camera plugin is currently implemented using [Web Activities][web_activities].

 #### iOS Quirks

@@ -187,7 +189,11 @@ Tizen only supports a `destinationType` of

 - Ignores the `cameraDirection` parameter.

- Ignores the `saveToPhotoAlbum` parameter.  IMPORTANT: All images taken with the wp7/8 cordova camera API are always copied to the phone's camera roll.  Depending on the user's settings, this could also mean the image is auto-uploaded to their OneDrive.  This could potentially mean the image is available to a wider audience than your app intended.  If this a blocker for your application, you will need to implement the CameraCaptureTask as documented on msdn : [http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx](http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx)
-You may also comment or up-vote the related issue in the [issue tracker](https://issues.apache.org/jira/browse/CB-2083)
+- Ignores the `saveToPhotoAlbum` parameter.  IMPORTANT: All images taken with the WP8/8 Cordova camera API are always copied to the phone's camera roll.  Depending on the user's settings, this could also mean the image is auto-uploaded to their OneDrive.  This could potentially mean the image is available to a wider audience than your app intended. If this is a blocker for your application, you will need to implement the CameraCaptureTask as [documented on MSDN][msdn_wp8_docs]. You may also comment or up-vote the related issue in the [issue tracker][wp8_bug].

 - Ignores the `mediaType` property of `cameraOptions` as the Windows Phone SDK does not provide a way to choose videos from PHOTOLIBRARY.
+
+[android_lifecycle]: http://cordova.apache.org/docs/en/dev/guide/platforms/android/lifecycle.html
+[web_activities]: https://hacks.mozilla.org/2013/01/introducing-web-activities/
+[wp8_bug]: https://issues.apache.org/jira/browse/CB-2083
+[msdn_wp8_docs]: http://msdn.microsoft.com/en-us/library/windowsphone/develop/hh394006.aspx
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-plugin-camera",
-  "version": "2.0.1-dev",
+  "version": "2.1.1",
  "description": "Cordova Camera Plugin",
  "cordova": {
    "id": "cordova-plugin-camera",
@@ -43,13 +43,16 @@
  },
  "scripts": {
    "precommit": "npm run gen-docs && git add README.md",
-    "gen-docs": "jsdoc2md --template \"jsdoc2md/TEMPLATE.md\" \"www/**/*.js\" --plugin \"dmd-plugin-cordova-plugin\" > README.md"
+    "gen-docs": "jsdoc2md --template \"jsdoc2md/TEMPLATE.md\" \"www/**/*.js\" --plugin \"dmd-plugin-cordova-plugin\" > README.md",
+    "test": "npm run jshint",
+    "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests"
  },
  "author": "Apache Software Foundation",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
  "devDependencies": {
    "dmd-plugin-cordova-plugin": "^0.1.0",
    "husky": "^0.10.1",
-    "jsdoc-to-markdown": "^1.2.0"
+    "jsdoc-to-markdown": "^1.2.0",
+    "jshint": "^2.6.0"
  }
 }
--- 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.0.1-dev">
+    version="2.1.1">
    <name>Camera</name>
    <description>Cordova Camera Plugin</description>
    <license>Apache 2.0</license>
@@ -30,10 +30,6 @@
    <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>

-    <engines>
-      <engine name="cordova-android" version=">=5.0.0-dev" />
-    </engines>
-
    <js-module src="www/CameraConstants.js" name="Camera">
        <clobbers target="Camera" />
    </js-module>
@@ -54,12 +50,12 @@
            <feature name="Camera">
                <param name="firefoxos-package" value="Camera" />
            </feature>
-        </config-file>                                         
-        
+        </config-file>
+
        <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
          <runs />
        </js-module>
-    </platform>  
+    </platform>

    <!-- android -->
    <platform name="android">
@@ -75,6 +71,7 @@
        <source-file src="src/android/CameraLauncher.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/PermissionHelper.java" target-dir="src/org/apache/cordova/camera" />

        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
            <clobbers target="CameraPopoverHandle" />
@@ -102,7 +99,7 @@
        </js-module>

     </platform>
-     
+
     <!-- ubuntu -->
     <platform name="ubuntu">
         <config-file target="config.xml" parent="/*">
@@ -151,11 +148,11 @@
         <framework src="MobileCoreServices.framework" />
         <framework src="CoreGraphics.framework" />
         <framework src="AVFoundation.framework" />
-         
+
         <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
             <string></string>
         </config-file>
-                  
+
     </platform>

    <!-- blackberry10 -->
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -114,12 +114,6 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
    private Uri scanMe;                     // Uri of image to be added to content store
    private Uri croppedUri;

-
-    protected void getReadPermission(int requestCode)
-    {
-        cordova.requestPermission(this, requestCode, Manifest.permission.READ_EXTERNAL_STORAGE);
-    }
-
    /**
     * Executes the request and returns PluginResult.
     *
@@ -174,12 +168,9 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
                    this.callTakePicture(destType, encodingType);
                }
                else if ((this.srcType == PHOTOLIBRARY) || (this.srcType == SAVEDPHOTOALBUM)) {
-                    // Any options that edit the file require READ permissions in order to try and
-                    // preserve the original exif data and filename in the modified file that is
-                    // created
-                    if(this.mediaType == PICTURE && (this.destType == FILE_URI || this.destType == NATIVE_URI)
-                            && fileWillBeModified() && !cordova.hasPermission(permissions[0])) {
-                        getReadPermission(SAVE_TO_ALBUM_SEC);
+                    // FIXME: Stop always requesting the permission
+                    if(!PermissionHelper.hasPermission(this, permissions[0])) {
+                        PermissionHelper.requestPermission(this, SAVE_TO_ALBUM_SEC, Manifest.permission.READ_EXTERNAL_STORAGE);
                    } else {
                        this.getImage(this.srcType, destType, encodingType);
                    }
@@ -238,10 +229,10 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
     * @param returnType        Set the type of image to return.
     */
    public void callTakePicture(int returnType, int encodingType) {
-        if (cordova.hasPermission(permissions[0])) {
+        if (PermissionHelper.hasPermission(this, permissions[0])) {
            takePicture(returnType, encodingType);
        } else {
-            getReadPermission(TAKE_PIC_SEC);
+            PermissionHelper.requestPermission(this, TAKE_PIC_SEC, Manifest.permission.READ_EXTERNAL_STORAGE);
        }
    }

@@ -1210,11 +1201,6 @@ private String ouputModifiedBitmap(Bitmap bitmap, Uri uri) throws IOException {
        }
    }

-    private boolean fileWillBeModified() {
-        return (this.targetWidth > 0 && this.targetHeight > 0) ||
-                    this.correctOrientation || this.allowEdit;
-    }
-
    /**
     * Taking or choosing a picture launches another Activity, so we need to implement the
     * save/restore APIs to handle the case where the CordovaActivity is killed by the OS
--- a/src/android/FileHelper.java
+++ b/src/android/FileHelper.java
@@ -17,11 +17,13 @@
 package org.apache.cordova.camera;

 import android.annotation.SuppressLint;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;
@@ -77,33 +79,70 @@ public class FileHelper {
    }

    @SuppressLint("NewApi")
-    public static String getRealPathFromURI_API19(Context context, Uri uri) {
-        String filePath = "";
-        try {
-            String wholeID = DocumentsContract.getDocumentId(uri);
+    public static String getRealPathFromURI_API19(final Context context, final Uri uri) {

-            // Split at colon, use second item in the array
-            String id = wholeID.indexOf(":") > -1 ? wholeID.split(":")[1] : wholeID.indexOf(";") > -1 ? wholeID
-                    .split(";")[1] : wholeID;
+        // DocumentProvider
+        if ( DocumentsContract.isDocumentUri(context, uri)) {

-            String[] column = { MediaStore.Images.Media.DATA };
+            // ExternalStorageProvider
+            if (isExternalStorageDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];

-            // where id is equal to
-            String sel = MediaStore.Images.Media._ID + "=?";
+                if ("primary".equalsIgnoreCase(type)) {
+                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+                }

-            Cursor cursor = context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, column,
-                    sel, new String[] { id }, null);
-
-            int columnIndex = cursor.getColumnIndex(column[0]);
-
-            if (cursor.moveToFirst()) {
-                filePath = cursor.getString(columnIndex);
+                // TODO handle non-primary volumes
+            }
+            // DownloadsProvider
+            else if (isDownloadsDocument(uri)) {
+
+                final String id = DocumentsContract.getDocumentId(uri);
+                final Uri contentUri = ContentUris.withAppendedId(
+                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+
+                return getDataColumn(context, contentUri, null, null);
+            }
+            // MediaProvider
+            else if (isMediaDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                Uri contentUri = null;
+                if ("image".equals(type)) {
+                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+
+                final String selection = "_id=?";
+                final String[] selectionArgs = new String[] {
+                        split[1]
+                };
+
+                return getDataColumn(context, contentUri, selection, selectionArgs);
            }
-            cursor.close();
-        } catch (Exception e) {
-            filePath = "";
        }
-        return filePath;
+        // MediaStore (and general)
+        else if ("content".equalsIgnoreCase(uri.getScheme())) {
+
+            // Return the remote address
+            if (isGooglePhotosUri(uri))
+                return uri.getLastPathSegment();
+
+            return getDataColumn(context, uri, null, null);
+        }
+        // File
+        else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+
+        return null;
    }

    @SuppressLint("NewApi")
@@ -228,4 +267,74 @@ public class FileHelper {

        return mimeType;
    }
+
+    /**
+     * Get the value of the data column for this Uri. This is useful for
+     * MediaStore Uris, and other file-based ContentProviders.
+     *
+     * @param context The context.
+     * @param uri The Uri to query.
+     * @param selection (Optional) Filter used in the query.
+     * @param selectionArgs (Optional) Selection arguments used in the query.
+     * @return The value of the _data column, which is typically a file path.
+     * @author paulburke
+     */
+    public static String getDataColumn(Context context, Uri uri, String selection,
+                                       String[] selectionArgs) {
+
+        Cursor cursor = null;
+        final String column = "_data";
+        final String[] projection = {
+                column
+        };
+
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+                    null);
+            if (cursor != null && cursor.moveToFirst()) {
+
+                final int column_index = cursor.getColumnIndexOrThrow(column);
+                return cursor.getString(column_index);
+            }
+        } finally {
+            if (cursor != null)
+                cursor.close();
+        }
+        return null;
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is ExternalStorageProvider.
+     * @author paulburke
+     */
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is DownloadsProvider.
+     * @author paulburke
+     */
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is MediaProvider.
+     * @author paulburke
+     */
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is Google Photos.
+     */
+    public static boolean isGooglePhotosUri(Uri uri) {
+        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    }
 }
--- a/src/android/PermissionHelper.java
+++ b/src/android/PermissionHelper.java
@@ -0,0 +1,138 @@
+/*
+       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;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.apache.cordova.CordovaInterface;
+import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.LOG;
+
+import android.content.pm.PackageManager;
+
+/**
+ * This class provides reflective methods for permission requesting and checking so that plugins
+ * written for cordova-android 5.0.0+ can still compile with earlier cordova-android versions.
+ */
+public class PermissionHelper {
+    private static final String LOG_TAG = "CordovaPermissionHelper";
+
+    /**
+     * Requests a "dangerous" permission for the application at runtime. This is a helper method
+     * alternative to cordovaInterface.requestPermission() that does not require the project to be
+     * built with cordova-android 5.0.0+
+     *
+     * @param plugin        The plugin the permission is being requested for
+     * @param requestCode   A requestCode to be passed to the plugin's onRequestPermissionResult()
+     *                      along with the result of the permission request
+     * @param permission    The permission to be requested
+     */
+    public static void requestPermission(CordovaPlugin plugin, int requestCode, String permission) {
+        PermissionHelper.requestPermissions(plugin, requestCode, new String[] {permission});
+    }
+
+    /**
+     * Requests "dangerous" permissions for the application at runtime. This is a helper method
+     * alternative to cordovaInterface.requestPermissions() that does not require the project to be
+     * built with cordova-android 5.0.0+
+     *
+     * @param plugin        The plugin the permissions are being requested for
+     * @param requestCode   A requestCode to be passed to the plugin's onRequestPermissionResult()
+     *                      along with the result of the permissions request
+     * @param permissions   The permissions to be requested
+     */
+    public static void requestPermissions(CordovaPlugin plugin, int requestCode, String[] permissions) {
+        try {
+            Method requestPermission = CordovaInterface.class.getDeclaredMethod(
+                    "requestPermissions", CordovaPlugin.class, int.class, String[].class);
+
+            // If there is no exception, then this is cordova-android 5.0.0+
+            requestPermission.invoke(plugin.cordova, plugin, requestCode, permissions);
+        } catch (NoSuchMethodException noSuchMethodException) {
+            // cordova-android version is less than 5.0.0, so permission is implicitly granted
+            LOG.d(LOG_TAG, "No need to request permissions " + Arrays.toString(permissions));
+
+            // Notify the plugin that all were granted by using more reflection
+            deliverPermissionResult(plugin, requestCode, permissions);
+        } catch (IllegalAccessException illegalAccessException) {
+            // Should never be caught; this is a public method
+            LOG.e(LOG_TAG, "IllegalAccessException when requesting permissions " + Arrays.toString(permissions), illegalAccessException);
+        } catch(InvocationTargetException invocationTargetException) {
+            // This method does not throw any exceptions, so this should never be caught
+            LOG.e(LOG_TAG, "invocationTargetException when requesting permissions " + Arrays.toString(permissions), invocationTargetException);
+        }
+    }
+
+    /**
+     * Checks at runtime to see if the application has been granted a permission. This is a helper
+     * method alternative to cordovaInterface.hasPermission() that does not require the project to
+     * be built with cordova-android 5.0.0+
+     *
+     * @param plugin        The plugin the permission is being checked against
+     * @param permission    The permission to be checked
+     *
+     * @return              True if the permission has already been granted and false otherwise
+     */
+    public static boolean hasPermission(CordovaPlugin plugin, String permission) {
+        try {
+            Method hasPermission = CordovaInterface.class.getDeclaredMethod("hasPermission", String.class);
+
+            // If there is no exception, then this is cordova-android 5.0.0+
+            return (Boolean) hasPermission.invoke(plugin.cordova, permission);
+        } catch (NoSuchMethodException noSuchMethodException) {
+            // cordova-android version is less than 5.0.0, so permission is implicitly granted
+            LOG.d(LOG_TAG, "No need to check for permission " + permission);
+            return true;
+        } catch (IllegalAccessException illegalAccessException) {
+            // Should never be caught; this is a public method
+            LOG.e(LOG_TAG, "IllegalAccessException when checking permission " + permission, illegalAccessException);
+        } catch(InvocationTargetException invocationTargetException) {
+            // This method does not throw any exceptions, so this should never be caught
+            LOG.e(LOG_TAG, "invocationTargetException when checking permission " + permission, invocationTargetException);
+        }
+        return false;
+    }
+
+    private static void deliverPermissionResult(CordovaPlugin plugin, int requestCode, String[] permissions) {
+        // Generate the request results
+        int[] requestResults = new int[permissions.length];
+        Arrays.fill(requestResults, PackageManager.PERMISSION_GRANTED);
+
+        try {
+            Method onRequestPermissionResult = CordovaPlugin.class.getDeclaredMethod(
+                    "onRequestPermissionResult", int.class, String[].class, int[].class);
+
+            onRequestPermissionResult.invoke(plugin, requestCode, permissions, requestResults);
+        } catch (NoSuchMethodException noSuchMethodException) {
+            // Should never be caught since the plugin must be written for cordova-android 5.0.0+ if it
+            // made it to this point
+            LOG.e(LOG_TAG, "NoSuchMethodException when delivering permissions results", noSuchMethodException);
+        } catch (IllegalAccessException illegalAccessException) {
+            // Should never be caught; this is a public method
+            LOG.e(LOG_TAG, "IllegalAccessException when delivering permissions results", illegalAccessException);
+        } catch(InvocationTargetException invocationTargetException) {
+            // This method may throw a JSONException. We are just duplicating cordova-android's
+            // exception handling behavior here; all it does is log the exception in CordovaActivity,
+            // print the stacktrace, and ignore it
+            LOG.e(LOG_TAG, "InvocationTargetException when delivering permissions results", invocationTargetException);
+        }
+    }
+}
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@ -18,6 +18,9 @@
 * under the License.
 *
 */
+
+/* globals qnx, FileError, PluginResult */
+
 var PictureSourceType = {
        PHOTOLIBRARY : 0,    // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
        CAMERA : 1,          // Take picture from camera
@@ -40,7 +43,7 @@ window.qnx.webplatform.getApplication().invocation.queryTargets(
    },
    function (error, targets) {
        invokeAvailable = !error && targets && targets instanceof Array &&
-            targets.filter(function (t) { return t.default === 'sys.camera.card' }).length > 0;
+            targets.filter(function (t) { return t.default === 'sys.camera.card'; }).length > 0;
    }
 );

@@ -85,7 +88,7 @@ function showCameraDialog (done, cancel, fail) {
 //create unique name for saved file (same pattern as BB10 camera app)
 function imgName() {
    var date = new Date(),
-        pad = function (n) { return n < 10 ? '0' + n : n };
+        pad = function (n) { return n < 10 ? '0' + n : n; };
    return 'IMG_' + date.getFullYear() + pad(date.getMonth() + 1) + pad(date.getDate()) + '_' +
            pad(date.getHours()) + pad(date.getMinutes()) + pad(date.getSeconds()) + '.png';
 }
@@ -145,7 +148,7 @@ function encodeBase64(filePath, callback) {
            default:
                msg += "Unknown Error";
                break;
-            };
+            }

            // set it back to original value
            window.qnx.webplatform.getController().setFileSystemSandbox = sandbox;
--- a/src/browser/CameraProxy.js
+++ b/src/browser/CameraProxy.js
@@ -19,17 +19,19 @@
 *
 */

+var HIGHEST_POSSIBLE_Z_INDEX = 2147483647;
+
 function takePicture(success, error, opts) {
    if (opts && opts[2] === 1) {
        capture(success, error);
    } else {
        var input = document.createElement('input');
+        input.style.position = 'relative';
+        input.style.zIndex = HIGHEST_POSSIBLE_Z_INDEX;
        input.type = 'file';
        input.name = 'files[]';

        input.onchange = function(inputEvent) {
-            var canvas = document.createElement('canvas');
-
            var reader = new FileReader();
            reader.onload = function(readerEvent) {
                input.parentNode.removeChild(input);
@@ -37,7 +39,7 @@ function takePicture(success, error, opts) {
                var imageData = readerEvent.target.result;

                return success(imageData.substr(imageData.indexOf(',') + 1));
-            }
+            };

            reader.readAsDataURL(inputEvent.target.files[0]);
        };
@@ -51,6 +53,11 @@ function capture(success, errorCallback) {

    var video = document.createElement('video');
    var button = document.createElement('button');
+    var parent = document.createElement('div');
+    parent.style.position = 'relative';
+    parent.style.zIndex = HIGHEST_POSSIBLE_Z_INDEX;
+    parent.appendChild(video);
+    parent.appendChild(button);

    video.width = 320;
    video.height = 240;
@@ -60,18 +67,24 @@ function capture(success, errorCallback) {
        // create a canvas and capture a frame from video stream
        var canvas = document.createElement('canvas');
        canvas.getContext('2d').drawImage(video, 0, 0, 320, 240);
-        
+
        // convert image stored in canvas to base64 encoded image
        var imageData = canvas.toDataURL('img/png');
        imageData = imageData.replace('data:image/png;base64,', '');

-        // stop video stream, remove video and button
-        localMediaStream.stop();
-        video.parentNode.removeChild(video);
-        button.parentNode.removeChild(button);
+        // stop video stream, remove video and button.
+        // Note that MediaStream.stop() is deprecated as of Chrome 47.
+        if (localMediaStream.stop) {
+            localMediaStream.stop();
+        } else {
+            localMediaStream.getTracks().forEach(function (track) {
+                track.stop();
+            });
+        }
+        parent.parentNode.removeChild(parent);

        return success(imageData);
-    }
+    };

    navigator.getUserMedia = navigator.getUserMedia ||
                             navigator.webkitGetUserMedia ||
@@ -83,9 +96,8 @@ function capture(success, errorCallback) {
        video.src = window.URL.createObjectURL(localMediaStream);
        video.play();

-        document.body.appendChild(video);
-        document.body.appendChild(button);
-    }
+        document.body.appendChild(parent);
+    };

    if (navigator.getUserMedia) {
        navigator.getUserMedia({video: true, audio: true}, successCallback, errorCallback);
--- a/src/firefoxos/CameraProxy.js
+++ b/src/firefoxos/CameraProxy.js
@@ -19,6 +19,8 @@
 *
 */

+/* globals MozActivity */
+
 function takePicture(success, error, opts) {
    var pick = new MozActivity({
        name: "pick",
@@ -32,7 +34,7 @@ function takePicture(success, error, opts) {
    pick.onsuccess = function() {
        // image is returned as Blob in this.result.blob
        // we need to call success with url or base64 encoded image
-        if (opts && opts.destinationType == 0) {
+        if (opts && opts.destinationType === 0) {
            // TODO: base64
            return;
        }
--- a/src/ios/CDVCamera.m
+++ b/src/ios/CDVCamera.m
@@ -558,11 +558,14 @@ static NSString* toBase64(NSData* data) {
    
    dispatch_block_t invoke = ^ (void) {
        CDVPluginResult* result;
-        if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
-            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"no image selected"];
-        } else {
+        if (picker.sourceType == UIImagePickerControllerSourceTypeCamera && [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != ALAuthorizationStatusAuthorized) {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"has no access to camera"];
+        } else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) {
            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"has no access to assets"];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"no image selected"];
        }
+
        
        [weakSelf.commandDelegate sendPluginResult:result callbackId:cameraPicker.callbackId];
        
--- a/src/windows/CameraProxy.js
+++ b/src/windows/CameraProxy.js
@@ -325,14 +325,14 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
        CaptureNS = Windows.Media.Capture,
        sensor = null;

-    var createCameraUI = function () {
+    function createCameraUI() {
        // create style for take and cancel buttons
        var buttonStyle = "width:45%;padding: 10px 16px;font-size: 18px;line-height: 1.3333333;color: #333;background-color: #fff;border-color: #ccc; border: 1px solid transparent;border-radius: 6px; display: block; margin: 20px; z-index: 1000;border-color: #adadad;";

        // Create fullscreen preview
        // z-order style element for capturePreview and cameraCancelButton elts
        // is necessary to avoid overriding by another page elements, -1 sometimes is not enough
-       capturePreview = document.createElement("video");
+        capturePreview = document.createElement("video");
        capturePreview.style.cssText = "position: fixed; left: 0; top: 0; width: 100%; height: 100%; z-index: " + (HIGHEST_POSSIBLE_Z_INDEX - 1) + ";";

        // Create capture button
@@ -349,14 +349,24 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {

        captureSettings = new CaptureNS.MediaCaptureInitializationSettings();
        captureSettings.streamingCaptureMode = CaptureNS.StreamingCaptureMode.video;
-    };
+    }

-    var startCameraPreview = function () {
+    function continueVideoOnFocus() {
+        // if preview is defined it would be stuck, play it
+        if (capturePreview) {
+            capturePreview.play();
+        }
+    }
+
+    function startCameraPreview() {
        // Search for available camera devices
        // This is necessary to detect which camera (front or back) we should use
        var DeviceEnum = Windows.Devices.Enumeration;
        var expectedPanel = cameraDirection === 1 ? DeviceEnum.Panel.front : DeviceEnum.Panel.back;

+        // Add focus event handler to capture the event when user suspends the app and comes back while the preview is on
+        window.addEventListener("focus", continueVideoOnFocus);
+
        DeviceEnum.DeviceInformation.findAllAsync(DeviceEnum.DeviceClass.videoCapture).then(function (devices) {
            if (devices.length <= 0) {
                destroyCameraPreview();
@@ -381,11 +391,17 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {

            if (FocusControl.supported === true) {
                capturePreview.addEventListener('click', function () {
-
+                    // Make sure function isn't called again before previous focus is completed
+                    if (this.getAttribute('clicked') === '1') {
+                        return false;
+                    } else {
+                        this.setAttribute('clicked', '1');
+                    }
                    var preset = Windows.Media.Devices.FocusPreset.autoNormal;
-
+                    var parent = this;
                    FocusControl.setPresetAsync(preset).done(function () {
-
+                        // set the clicked attribute back to '0' to allow focus again
+                        parent.setAttribute('clicked', '0');
                    });
                });
            }
@@ -437,9 +453,9 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
            destroyCameraPreview();
            errorCallback('Camera intitialization error ' + err);
        });
-    };
+    }

-    var destroyCameraPreview = function () {
+    function destroyCameraPreview() {
        // If sensor is available, remove event listener
        if (sensor !== null) {
            sensor.removeEventListener('orientationchanged', onOrientationChange);
@@ -453,6 +469,9 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
        cameraCaptureButton.removeEventListener('click', onCameraCaptureButtonClick);
        cameraCancelButton.removeEventListener('click', onCameraCancelButtonClick);

+        // Remove the focus event handler
+        window.removeEventListener("focus", continueVideoOnFocus);
+
        // Remove elements
        [capturePreview, cameraCaptureButton, cameraCancelButton].forEach(function (elem) {
            if (elem /* && elem in document.body.childNodes */) {
@@ -465,9 +484,9 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
            capture.stopRecordAsync();
            capture = null;
        }
-    };
+    }

-    var captureAction = function () {
+    function captureAction() {

        var encodingProperties,
            fileName,
@@ -529,9 +548,9 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
                destroyCameraPreview();
                errorCallback(err);
            });
-    };
+    }

-    var getAspectRatios = function (capture) {
+    function getAspectRatios(capture) {
        var videoDeviceController = capture.videoDeviceController;
        var photoAspectRatios = videoDeviceController.getAvailableMediaStreamProperties(CapMSType.photo).map(function (element) {
            return (element.width / element.height).toFixed(1);
@@ -558,9 +577,9 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
        return Object.keys(aspectObj).filter(function (k) {
            return aspectObj[k] === 3;
        });
-    };
+    }

-    var setAspectRatio = function (capture, aspect) {
+    function setAspectRatio(capture, aspect) {
        // Max photo resolution with desired aspect ratio
        var videoDeviceController = capture.videoDeviceController;
        var photoResolution = videoDeviceController.getAvailableMediaStreamProperties(CapMSType.photo)
@@ -596,12 +615,12 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
            .then(function () {
                return videoDeviceController.setMediaStreamPropertiesAsync(CapMSType.videoRecord, videoRecordResolution);
            });
-    };
+    }

    /**
     * When Capture button is clicked, try to capture a picture and return
     */
-    var onCameraCaptureButtonClick = function() {
+    function onCameraCaptureButtonClick() {
        // Make sure user can't click more than once
        if (this.getAttribute('clicked') === '1') {
            return false;
@@ -609,12 +628,12 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
            this.setAttribute('clicked', '1');
        }
        captureAction();
-    };
+    }

    /**
     * When Cancel button is clicked, destroy camera preview and return with error callback
     */
-    var onCameraCancelButtonClick = function() {
+    function onCameraCancelButtonClick() {
        // Make sure user can't click more than once
        if (this.getAttribute('clicked') === '1') {
            return false;
@@ -623,15 +642,15 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
        }
        destroyCameraPreview();
        errorCallback('no image selected');
-    };
+    }

    /**
     * When the phone orientation change, get the event and change camera preview rotation
     * @param  {Object} e - SimpleOrientationSensorOrientationChangedEventArgs
     */
-    var onOrientationChange = function (e) {
+    function onOrientationChange(e) {
        setPreviewRotation(e.orientation);
-    };
+    }

    /**
     * Converts SimpleOrientation to a VideoRotation to remove difference between camera sensor orientation
@@ -639,7 +658,7 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
     * @param  {number} orientation - Windows.Devices.Sensors.SimpleOrientation
     * @return {number} - Windows.Media.Capture.VideoRotation
     */
-    var orientationToRotation = function (orientation) {
+    function orientationToRotation(orientation) {
        // VideoRotation enumerable and BitmapRotation enumerable have the same values
        // https://msdn.microsoft.com/en-us/library/windows/apps/windows.media.capture.videorotation.aspx
        // https://msdn.microsoft.com/en-us/library/windows/apps/windows.graphics.imaging.bitmaprotation.aspx
@@ -663,15 +682,15 @@ function takePictureFromCameraWP(successCallback, errorCallback, args) {
                // Falling back to portrait default
                return Windows.Media.Capture.VideoRotation.clockwise90Degrees;
        }
-    };
+    }

    /**
     * Rotates the current MediaCapture's video
     * @param {number} orientation - Windows.Devices.Sensors.SimpleOrientation
     */
-    var setPreviewRotation = function(orientation) {
+    function setPreviewRotation(orientation) {
        capture.setPreviewRotation(orientationToRotation(orientation));
-    };
+    }

    try {
        createCameraUI();
@@ -704,9 +723,14 @@ function takePictureFromCameraWindows(successCallback, errorCallback, args) {
    var UIMaxRes = WMCapture.CameraCaptureUIMaxPhotoResolution;
    var totalPixels = targetWidth * targetHeight;

-    if (totalPixels <= 320 * 240) {
+    if (targetWidth == -1 && targetHeight == -1) {
+        maxRes = UIMaxRes.highestAvailable;
+    }
+    // Temp fix for CB-10539
+    /*else if (totalPixels <= 320 * 240) {
        maxRes = UIMaxRes.verySmallQvga;
-    } else if (totalPixels <= 640 * 480) {
+    }*/
+    else if (totalPixels <= 640 * 480) {
        maxRes = UIMaxRes.smallVga;
    } else if (totalPixels <= 1024 * 768) {
        maxRes = UIMaxRes.mediumXga;
@@ -720,21 +744,32 @@ function takePictureFromCameraWindows(successCallback, errorCallback, args) {

    cameraCaptureUI.photoSettings.maxResolution = maxRes;

-    cameraCaptureUI.captureFileAsync(WMCapture.CameraCaptureUIMode.photo).done(function(picture) {
-        if (!picture) {
-            errorCallback("User didn't capture a photo.");
-            return;
-        }
+    var cameraPicture;
+    var savePhotoOnFocus = function() {

-        savePhoto(picture, {
+        window.removeEventListener("focus", savePhotoOnFocus);
+        // call only when the app is in focus again
+        savePhoto(cameraPicture, {
            destinationType: destinationType,
            targetHeight: targetHeight,
            targetWidth: targetWidth,
            encodingType: encodingType,
            saveToPhotoAlbum: saveToPhotoAlbum
        }, successCallback, errorCallback);
+    };
+
+    // add and delete focus eventHandler to capture the focus back from cameraUI to app 
+    window.addEventListener("focus", savePhotoOnFocus);
+    cameraCaptureUI.captureFileAsync(WMCapture.CameraCaptureUIMode.photo).done(function(picture) {
+        if (!picture) {
+            errorCallback("User didn't capture a photo.");
+            window.removeEventListener("focus", savePhotoOnFocus);
+            return;
+        }
+        cameraPicture = picture;
    }, function() {
        errorCallback("Fail to capture a photo.");
+        window.removeEventListener("focus", savePhotoOnFocus);
    });
 }

--- a/tests/plugin.xml
+++ b/tests/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-tests"
-    version="2.0.1-dev">
+    version="2.1.1">
    <name>Cordova Camera Plugin Tests</name>
    <license>Apache 2.0</license>
    
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -19,6 +19,9 @@
 *
 */

+/* globals Camera, resolveLocalFileSystemURI, FileEntry, CameraPopoverOptions, FileTransfer, FileUploadOptions, LocalFileSystem, MSApp */
+/* jshint jasmine: true */
+
 exports.defineAutoTests = function () {
    describe('Camera (navigator.camera)', function () {
        it("should exist", function () {
@@ -78,7 +81,6 @@ exports.defineAutoTests = function () {
 /******************************************************************************/

 exports.defineManualTests = function (contentEl, createActionButton) {
-    var platformId = cordova.require('cordova/platform').id;
    var pictureUrl = null;
    var fileObj = null;
    var fileEntry = null;
@@ -94,11 +96,6 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    var camCorrectOrientationDefault = ['correctOrientation', false];
    var camSaveToPhotoAlbumDefault = ['saveToPhotoAlbum', true];

-    var clearLog = function () {
-        var log = document.getElementById('info');
-        log.innerHTML = "";
-    }
-
    function log(value) {
        console.log(value);
        document.getElementById('camera_status').textContent += (new Date() - pageStartTime) / 1000 + ': ' + value + '\n';
@@ -121,8 +118,8 @@ exports.defineManualTests = function (contentEl, createActionButton) {
            url = "data:image/jpeg;base64," + url;
        } catch (e) {
            // not DATA_URL
-            log('URL: ' + url.slice(0, 100));
        }
+        log('URL: "' + url.slice(0, 90) + '"');

        pictureUrl = url;
        var img = document.getElementById('camera_image');
@@ -130,7 +127,9 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        img.src = url;
        img.onloadend = function () {
            log('Image tag load time: ' + (new Date() - startTime));
-            callback && callback();
+            if (callback) {
+                callback();
+            }
        };
    }

@@ -141,12 +140,13 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    function getPictureWin(data) {
        setPicture(data);
        // TODO: Fix resolveLocalFileSystemURI to work with native-uri.
-        if (pictureUrl.indexOf('file:') == 0 || pictureUrl.indexOf('content:') == 0 || pictureUrl.indexOf('ms-appdata:') === 0) {
+        if (pictureUrl.indexOf('file:') === 0 || pictureUrl.indexOf('content:') === 0 || pictureUrl.indexOf('ms-appdata:') === 0 || pictureUrl.indexOf('assets-library:') === 0) {
            resolveLocalFileSystemURI(data, function (e) {
                fileEntry = e;
                logCallback('resolveLocalFileSystemURI()', true)(e.toURL());
+                readFile();
            }, logCallback('resolveLocalFileSystemURI()', false));
-        } else if (pictureUrl.indexOf('data:image/jpeg;base64') == 0) {
+        } else if (pictureUrl.indexOf('data:image/jpeg;base64') === 0) {
            // do nothing
        } else {
            var path = pictureUrl.replace(/^file:\/\/(localhost)?/, '').replace(/%20/g, ' ');
@@ -164,13 +164,11 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        window.onorientationchange = function () {
            var newPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, 0);
            popoverHandle.setPosition(newPopoverOptions);
-        }
+        };
    }

    function uploadImage() {
        var ft = new FileTransfer(),
-            uploadcomplete = 0,
-            progress = 0,
            options = new FileUploadOptions();
        options.fileKey = "photo";
        options.fileName = 'test.jpg';
@@ -206,7 +204,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
            img.style.display = "block";
            img.src = evt.target.result;
            log("FileReader.readAsDataURL success");
-        };
+        }

        function onFileReceived(file) {
            log('Got file: ' + JSON.stringify(file));
@@ -217,8 +215,10 @@ exports.defineManualTests = function (contentEl, createActionButton) {
                log('FileReader.readAsDataURL() - length = ' + reader.result.length);
            };
            reader.onerror = logCallback('FileReader.readAsDataURL', false);
+            reader.onloadend = onFileReadAsDataURL;
            reader.readAsDataURL(file);
-        };
+        }
+
        // Test out onFileReceived when the file object was set via a native <input> elements.
        if (fileObj) {
            onFileReceived(fileObj);
@@ -226,13 +226,14 @@ exports.defineManualTests = function (contentEl, createActionButton) {
            fileEntry.file(onFileReceived, logCallback('FileEntry.file', false));
        }
    }
+
    function getFileInfo() {
        // Test FileEntry API here.
        fileEntry.getMetadata(logCallback('FileEntry.getMetadata', true), logCallback('FileEntry.getMetadata', false));
        fileEntry.setMetadata(logCallback('FileEntry.setMetadata', true), logCallback('FileEntry.setMetadata', false), { "com.apple.MobileBackup": 1 });
        fileEntry.getParent(logCallback('FileEntry.getParent', true), logCallback('FileEntry.getParent', false));
        fileEntry.getParent(logCallback('FileEntry.getParent', true), logCallback('FileEntry.getParent', false));
-    };
+    }

    /**
     * Copy image from library using a NATIVE_URI destination type
@@ -266,7 +267,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        };

        window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, onFileSystemReceived, null);
-    };
+    }

    /**
     * Write image to library using a NATIVE_URI destination type
@@ -287,7 +288,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {

        fileEntry.createWriter(onFileWriterReceived, logCallback('FileEntry.createWriter', false));
        fileEntry.createWriter(onFileTruncateWriterReceived, null);
-    };
+    }

    function displayImageUsingCanvas() {
        var canvas = document.getElementById('canvas');
@@ -300,7 +301,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        canvas.height = h;
        var context = canvas.getContext('2d');
        context.drawImage(img, 0, 0, w, h);
-    };
+    }

    /**
     * Remove image from library using a NATIVE_URI destination type
@@ -308,7 +309,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
     */
    function removeImage() {
        fileEntry.remove(logCallback('FileEntry.remove', true), logCallback('FileEntry.remove', false));
-    };
+    }

    function testInputTag(inputEl) {
        clearStatus();
@@ -317,7 +318,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
        window.setTimeout(function () {
            testNativeFile2(inputEl);
        }, 0);
-    };
+    }

    function testNativeFile2(inputEl) {
        if (!inputEl.value) {
@@ -347,24 +348,28 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    function extractOptions() {
        var els = document.querySelectorAll('#image-options select');
        var ret = {};
+        /*jshint -W084 */
        for (var i = 0, el; el = els[i]; ++i) {
            var value = el.value;
            if (value === '') continue;
+            value = +value;
+
            if (el.isBool) {
-                ret[el.getAttribute("name")] = !!+value;
+                ret[el.getAttribute("name")] = !!value;
            } else {
-                ret[el.getAttribute("name")] = +value;
+                ret[el.getAttribute("name")] = value;
            }
        }
+        /*jshint +W084 */
        return ret;
    }

    function createOptionsEl(name, values, selectionDefault) {
        var openDiv = '<div style="display: inline-block">' + name + ': ';
-        var select = '<select name=' + name + '>';
+        var select = '<select name=' + name + ' id="' + name + '">';

        var defaultOption = '';
-        if (selectionDefault == undefined) {
+        if (selectionDefault === undefined) {
            defaultOption = '<option value="">default</option>';
        }

@@ -460,7 +465,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
    var elements = document.getElementsByClassName("testInputTag");
    var listener = function (e) {
        testInputTag(e.target);
-    }
+    };
    for (var i = 0; i < elements.length; ++i) {
        var item = elements[i];
        item.addEventListener("change", listener, false);
--- a/www/Camera.js
+++ b/www/Camera.js
@@ -25,7 +25,7 @@ var argscheck = require('cordova/argscheck'),
    // XXX: commented out
    //CameraPopoverHandle = require('./CameraPopoverHandle');

-/** 
+/**
 * @namespace navigator
 */

@@ -80,37 +80,37 @@ for (var key in Camera) {
 /**
 * @description Takes a photo using the camera, or retrieves a photo from the device's
 * image gallery.  The image is passed to the success callback as a
- * base64-encoded `String`, or as the URI for the image file.  
- * 
+ * Base64-encoded `String`, or as the URI for the image file.
+ *
 * The `camera.getPicture` function opens the device's default camera
 * application that allows users to snap pictures by default - this behavior occurs,
- * when `Camera.sourceType` equals [`Camera.PictureSourceType.CAMERA`]{@link module:Camera.PictureSourceType}.  
+ * when `Camera.sourceType` equals [`Camera.PictureSourceType.CAMERA`]{@link module:Camera.PictureSourceType}.
 * Once the user snaps the photo, the camera application closes and the application is restored.
- * 
+ *
 * If `Camera.sourceType` is `Camera.PictureSourceType.PHOTOLIBRARY` or
 * `Camera.PictureSourceType.SAVEDPHOTOALBUM`, then a dialog displays
 * that allows users to select an existing image.  The
 * `camera.getPicture` function returns a [`CameraPopoverHandle`]{@link module:CameraPopoverHandle} object,
 * which can be used to reposition the image selection dialog, for
 * example, when the device orientation changes.
- * 
+ *
 * The return value is sent to the [`cameraSuccess`]{@link module:camera.onSuccess} callback function, in
 * one of the following formats, depending on the specified
 * `cameraOptions`:
- * 
- * - A `String` containing the base64-encoded photo image.
- * 
+ *
+ * - A `String` containing the Base64-encoded photo image.
+ *
 * - A `String` representing the image file location on local storage (default).
- * 
+ *
 * You can do whatever you want with the encoded image or URI, for
 * example:
- * 
+ *
 * - Render the image in an `<img>` tag, as in the example below
- * 
+ *
 * - Save the data locally (`LocalStorage`, [Lawnchair](http://brianleroux.github.com/lawnchair/), etc.)
- * 
+ *
 * - Post the data to a remote server
- * 
+ *
 * __NOTE__: Photo resolution on newer devices is quite good. Photos
 * selected from the device's gallery are not downscaled to a lower
 * quality, even if a `quality` parameter is specified.  To avoid common
@@ -119,11 +119,18 @@ for (var key in Camera) {
 *
 * __Supported Platforms__
 *
- * ![](doc/img/android-success.png) ![](doc/img/blackberry-success.png) ![](doc/img/browser-success.png) ![](doc/img/firefox-success.png) ![](doc/img/fireos-success.png) ![](doc/img/ios-success.png) ![](doc/img/windows-success.png) ![](doc/img/wp8-success.png) ![](doc/img/ubuntu-success.png)
+ * - Android
+ * - BlackBerry
+ * - Browser
+ * - Firefox
+ * - FireOS
+ * - iOS
+ * - Windows
+ * - WP8
+ * - Ubuntu
 *
- * * [More examples](#camera-getPicture-examples)
+ * More examples [here](#camera-getPicture-examples). Quirks [here](#camera-getPicture-quirks).
 *
- * * [Quirks](#camera-getPicture-quirks)
 * @example
 * navigator.camera.getPicture(cameraSuccess, cameraError, cameraOptions);
 * @param {module:camera.onSuccess} successCallback
@@ -164,11 +171,11 @@ cameraExport.getPicture = function(successCallback, errorCallback, options) {
 *
 * __Supported Platforms__
 *
- * ![](doc/img/android-fail.png) ![](doc/img/blackberry-fail.png) ![](doc/img/browser-fail.png) ![](doc/img/firefox-fail.png) ![](doc/img/fireos-fail.png) ![](doc/img/ios-success.png) ![](doc/img/windows-fail.png) ![](doc/img/wp8-fail.png) ![](doc/img/ubuntu-fail.png) 
+ * - iOS
 *
 * @example
 * navigator.camera.cleanup(onSuccess, onFail);
- * 
+ *
 * function onSuccess() {
 *     console.log("Camera cleanup success.")
 * }
--- a/www/CameraPopoverHandle.js
+++ b/www/CameraPopoverHandle.js
@@ -19,10 +19,8 @@
 *
 */

-var exec = require('cordova/exec');
-
 /**
- * @ignore in favour of ios' one
+ * @ignore in favour of iOS' one
 * A handle to an image picker popover.
 */
 var CameraPopoverHandle = function() {
--- a/www/blackberry10/assets/camera.js
+++ b/www/blackberry10/assets/camera.js
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 *
-*/
+ */

 document.addEventListener('DOMContentLoaded', function () {
    document.getElementById('back').onclick = function () {
--- a/www/ios/CameraPopoverHandle.js
+++ b/www/ios/CameraPopoverHandle.js
@@ -21,7 +21,7 @@

 var exec = require('cordova/exec');

-/** 
+/**
 * @namespace navigator
 */

@@ -30,16 +30,16 @@ var exec = require('cordova/exec');
 *
 * __Supported Platforms__
 *
- * ![](doc/img/android-fail.png) ![](doc/img/blackberry-fail.png) ![](doc/img/browser-fail.png) ![](doc/img/firefox-fail.png) ![](doc/img/fireos-fail.png) ![](doc/img/ios-success.png) ![](doc/img/windows-fail.png) ![](doc/img/wp8-fail.png) ![](doc/img/ubuntu-fail.png) 
+ * - iOS
 *
 * @example
 * var cameraPopoverHandle = navigator.camera.getPicture(onSuccess, onFail,
- * { 
+ * {
 *     destinationType: Camera.DestinationType.FILE_URI,
 *     sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
 *     popoverOptions: new CameraPopoverOptions(300, 300, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY)
 * });
- * 
+ *
 * // Reposition the popover if the orientation changes.
 * window.onorientationchange = function() {
 *     var cameraPopoverOptions = new CameraPopoverOptions(0, 0, 100, 100, Camera.PopoverArrowDirection.ARROW_ANY);
Author	SHA1	Message	Date
Carlos Santana	37dd471d0e	CB-10820 Updated version and RELEASENOTES.md for release 2.1.1	2016-03-09 22:11:36 -05:00
Richard Knoll	a19c75253a	CB-10825 android: Always request READ permission for gallery source This closes #191	2016-03-09 17:56:20 -08:00
Carlos Santana	c20e031d42	added apache license header to appium files	2016-03-08 22:21:47 -05:00
Dmitry Blotsky	68a1150939	CB-10720 Fixed spelling, capitalization, and other small issues.	2016-03-03 15:21:40 -08:00
Raghav Katyal	9c906b2ab7	CB-10414: Adding focus handler to resume video when user comes back on leaving the app while preview was running	2016-03-02 14:15:01 -08:00
Alexander Sorokin	56b9469313	Appium tests: adjust swipe distance on Android	2016-03-02 17:39:59 +03:00
Alexander Sorokin	d51e23ad7b	CB-10750 Appium tests: fail fast if session is irrecoverable	2016-03-02 13:23:51 +03:00
Raghav Katyal	2cd2528d1c	Adding missing semi colon	2016-02-29 10:30:40 -08:00
Raghav Katyal	5f7f4f3e55	Adding focus handler to make sure filepicker gets launched when app is active	2016-02-26 14:15:27 -08:00
Miguel Revetria	20dcaf2cb3	CB-10128: [iOS] Fixed how checks access authorization to camera & library. This closes #146	2016-02-24 16:10:20 -08:00
daserge	b16c5234d5	CB-10636 Add JSHint for plugins	2016-02-24 17:14:58 +03:00
Alexander Sorokin	c1948fc0d4	CB-10639 Appium tests: Added some timeouts, Taking a screenshot on failure, Retry taking a picture up to 3 times, Try to restart the Appium session if it's lost	2016-02-24 16:44:29 +03:00
Dmitry Blotsky	f792aaacc3	CB-10552 Replacing images in README.md.	2016-02-22 12:06:29 -08:00
Julio César	16636d18f2	Added a lot of more cases to get the real path Added a lot of more cases to get the real path This closes #175	2016-02-22 11:54:22 -08:00
Julio César	019346d188	Fix for CB-10625 getDocumentId was crashing in some cases. Now, in case it crashes, it will use the original uri to query.	2016-02-22 11:23:53 -08:00
Alexander Sorokin	61b77951e1	CB-10619 Appium tests: Properly switch to webview	2016-02-16 16:28:43 +03:00
Alexander Sorokin	a060fb36f3	CB-10397 Added Appium tests	2016-02-12 14:13:46 +03:00
Sarangan Rajamanickam	77653183dd	CB-10576: MobileSpec can't get results for Windows-Store 8.1 Builds Fixing a minor syntax issue	2016-02-09 16:17:17 -08:00
t1st3	df734a522c	chore: edit package.json license to match SPDX id See [NPM package.json spec for licenses](https://docs.npmjs.com/files/package.json#license) and [SPDX license IDs](https://spdx.org/licenses/) X-ref: https://github.com/apache/cordova-plugin-device/pull/48	2016-02-06 11:16:08 +01:00
Raghav Katyal	654286d373	CB-10539: Commenting out the verySmallQvga maxResolution option	2016-02-05 15:03:19 -08:00
Raghav Katyal	76ad059c9c	CB-10541: Changing default maxResoltion to be highestAvailable for CameraCaptureUI	2016-02-04 12:14:16 -08:00
Laurent Deketelaere	5b38453262	CB-10113 Browser - Layer camera UI on top of all! Adds CSS style {position: 'relative', z-index: 2147483647} (2147483647 is the highest possible z-index) on DOM appended elements. This closes #134	2016-02-02 17:02:15 +10:00
Tim Barham	e48a7e5c5c	CB-10502 Fix camera plugin exception in Chrome when click capture. The MediaStream.stop() method has been deprecated as of Chrome 47. We were using it, and it was generating an exception. If stop() method is not found, instead stop each individual track (the new way of doing it).	2016-02-02 16:31:39 +10:00
Raghav Katyal	06fcbf05a2	Adding comments	2016-01-21 14:11:59 -08:00
PerfectionCSGO	9a9081b0d4	Camera tapping fix	2016-01-21 14:07:51 -08:00
Steve Gill	6f7ce333cc	CB-10368 Incremented plugin version.	2016-01-15 16:58:32 -08:00
Steve Gill	0f32b78c82	CB-10368 Updated version and RELEASENOTES.md for release 2.1.0	2016-01-15 16:35:05 -08:00
Steve Gill	eb009471ab	added .ratignore	2016-01-15 15:09:14 -08:00
riknoll	1d32ea46f0	CB-10319 android: Adding reflective helper methods for permission requests	2016-01-12 17:42:29 -08:00