You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2017/04/27 17:30:23 UTC
[01/12] cordova-plugin-camera git commit: CB-12519 Updated version
and RELEASENOTES.md for release 2.4.0
Repository: cordova-plugin-camera
Updated Branches:
refs/heads/2.4.x d16482d29 -> 03c800b6c
CB-12519 Updated version and RELEASENOTES.md for release 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/e4ff41c0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/e4ff41c0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/e4ff41c0
Branch: refs/heads/2.4.x
Commit: e4ff41c07c8cf817d17bce6fcbe60fd507428bc0
Parents: 4fc2515
Author: Steve Gill <st...@gmail.com>
Authored: Tue Feb 28 17:41:23 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Feb 28 17:41:23 2017 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 12 ++
package.json | 2 +-
plugin.xml | 477 +++++++++++++++++++++-----------------------------
tests/plugin.xml | 38 +---
4 files changed, 215 insertions(+), 314 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/e4ff41c0/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9aa85ed..81eec43 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,18 @@
-->
# Release Notes
+### 2.3.2 (Feb 28, 2017)
+* [CB-12501](https://issues.apache.org/jira/browse/CB-12501) **Android**: Appium tests don't use `XPath` selectors anymore
+* [CB-12469](https://issues.apache.org/jira/browse/CB-12469) Appium tests can now run on **iOS 10**
+* [CB-12005](https://issues.apache.org/jira/browse/CB-12005) Changing the `getOrientation` method to return the defined enumerated `EXIF` instead of orientation in degrees for Consistency
+* [CB-12368](https://issues.apache.org/jira/browse/CB-12368) Fix permission check on **Android**
+* [CB-12353](https://issues.apache.org/jira/browse/CB-12353) Corrected merges usage in `plugin.xml`
+* [CB-12369](https://issues.apache.org/jira/browse/CB-12369) Add plugin typings from `DefinitelyTyped`
+* [CB-12363](https://issues.apache.org/jira/browse/CB-12363) Added build badges for **iOS 9.3** and **iOS 10.0**
+* [CB-12312](https://issues.apache.org/jira/browse/CB-12312) [Appium] [Android] A few changes to the tests: - updated comments on how to run the tests. extra comments around functionality at certain points in the automation. - stub of a resolution checker on test startup - still need to figure out acceptable values. - moved session shutdown to an afterAll clause. - changed resolution determiner from using webview-based values to using the native windows dimensions - this helps as the webview values may be scaled down intentionally by manufacturers (via changing devicePixelRatio). furthermore, since the screen dimension automation is used purely for native UI automation, better to use the dimensions reported by the native context rather than the web context. - when finding elements by XPath, use multiple calls to avoid a Windows emulator + Android bug. Made this pattern consistent in the entire test.
+* [CB-12236](https://issues.apache.org/jira/browse/CB-12236) - Fixed RELEASENOTES for cordova-plugin-camera
+* [CB-12230](https://issues.apache.org/jira/browse/CB-12230) Removed Windows 8.1 build badges
+
### 2.3.1 (Dec 07, 2016)
* [CB-12224](https://issues.apache.org/jira/browse/CB-12224) Updated version and RELEASENOTES.md for release 2.3.1
* Fix missing license headers.
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/e4ff41c0/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 8109011..4bac73c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-camera",
- "version": "2.3.2-dev",
+ "version": "2.4.0",
"description": "Cordova Camera Plugin",
"types": "./types/index.d.ts",
"cordova": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/e4ff41c0/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 98ed6a6..f1684d9 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,285 +1,200 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:rim="http://www.blackberry.com/ns/widgets"
- id="cordova-plugin-camera"
- version="2.3.2-dev">
- <name>Camera</name>
- <description>Cordova Camera Plugin</description>
- <license>Apache 2.0</license>
- <keywords>cordova,camera</keywords>
- <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
- <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
-
- <dependency id="cordova-plugin-compat" version="^1.1.0" />
-
- <js-module src="www/CameraConstants.js" name="Camera">
- <clobbers target="Camera" />
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera" version="2.4.0">
+ <name>Camera</name>
+ <description>Cordova Camera Plugin</description>
+ <license>Apache 2.0</license>
+ <keywords>cordova,camera</keywords>
+ <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
+ <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
+ <dependency id="cordova-plugin-compat" version="^1.1.0"/>
+ <js-module src="www/CameraConstants.js" name="Camera">
+ <clobbers target="Camera"/>
+ </js-module>
+ <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
+ <clobbers target="CameraPopoverOptions"/>
+ </js-module>
+ <js-module src="www/Camera.js" name="camera">
+ <clobbers target="navigator.camera"/>
+ </js-module>
+ <platform name="firefoxos">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="firefoxos-package" value="Camera"/>
+ </feature>
+ </config-file>
+ <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
+ <runs/>
</js-module>
-
- <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
- <clobbers target="CameraPopoverOptions" />
+ </platform>
+ <platform name="android">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
+ </feature>
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="/*">
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="application">
+ <provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>
+ </provider>
+ </config-file>
+ <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera"/>
+ <source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera"/>
+ <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera"/>
+ <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera"/>
+ <source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml"/>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
</js-module>
-
-
-
- <js-module src="www/Camera.js" name="camera">
- <clobbers target="navigator.camera" />
+ <framework src="com.android.support:support-v4:24.1.1+"/>
+ </platform>
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
+ </feature>
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="/*">
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ </config-file>
+ <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"/>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
</js-module>
-
- <!-- firefoxos -->
- <platform name="firefoxos">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="firefoxos-package" value="Camera" />
- </feature>
- </config-file>
-
- <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
- <runs />
- </js-module>
- </platform>
-
- <!-- android -->
- <platform name="android">
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
- </feature>
- </config-file>
- <config-file target="AndroidManifest.xml" parent="/*">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- </config-file>
- <config-file target="AndroidManifest.xml" parent="application">
- <provider
- android:name="android.support.v4.content.FileProvider"
- android:authorities="${applicationId}.provider"
- android:exported="false"
- android:grantUriPermissions="true" >
- <meta-data
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/provider_paths"/>
- </provider>
- </config-file>
-
- <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
- <source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera" />
- <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
- <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera" />
- <source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml" />
-
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
-
- <framework src="com.android.support:support-v4:24.1.1+" />
-
- </platform>
-
- <!-- amazon-fireos -->
- <platform name="amazon-fireos">
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
- </feature>
- </config-file>
- <config-file target="AndroidManifest.xml" parent="/*">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- </config-file>
-
- <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" />
-
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
-
- </platform>
-
- <!-- ubuntu -->
- <platform name="ubuntu">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param policy_group="camera" policy_version="1" />
- </feature>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- <header-file src="src/ubuntu/camera.h" />
- <source-file src="src/ubuntu/camera.cpp" />
-
- <resource-file src="src/ubuntu/back.png" />
- <resource-file src="src/ubuntu/CaptureWidget.qml" />
- <resource-file src="src/ubuntu/shoot.png" />
- <resource-file src="src/ubuntu/toolbar-left.png" />
- <resource-file src="src/ubuntu/toolbar-middle.png" />
- <resource-file src="src/ubuntu/toolbar-right.png" />
- </platform>
-
- <!-- ios -->
- <platform name="ios">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="ios-package" value="CDVCamera" />
- </feature>
- <preference name="CameraUsesGeolocation" value="false" />
- </config-file>
-
- <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
-
- <header-file src="src/ios/UIImage+CropScaleOrientation.h" />
- <source-file src="src/ios/UIImage+CropScaleOrientation.m" />
- <header-file src="src/ios/CDVCamera.h" />
- <source-file src="src/ios/CDVCamera.m" />
- <header-file src="src/ios/CDVJpegHeaderWriter.h" />
- <source-file src="src/ios/CDVJpegHeaderWriter.m" />
- <header-file src="src/ios/CDVExif.h" />
- <framework src="ImageIO.framework" weak="true" />
- <framework src="CoreLocation.framework" />
- <framework src="CoreGraphics.framework" />
- <framework src="AssetsLibrary.framework" />
- <framework src="MobileCoreServices.framework" />
- <framework src="CoreGraphics.framework" />
- <framework src="AVFoundation.framework" />
-
- <preference name="CAMERA_USAGE_DESCRIPTION" default=" " />
- <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
- <string>$CAMERA_USAGE_DESCRIPTION</string>
- </config-file>
-
- <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" " />
- <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
- <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
- </config-file>
-
- <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
- <string></string>
- </config-file>
-
- </platform>
-
- <!-- blackberry10 -->
- <platform name="blackberry10">
- <source-file src="src/blackberry10/index.js" target-dir="Camera" />
- <config-file target="www/config.xml" parent="/widget">
- <feature name="Camera" value="Camera"/>
- </config-file>
- <config-file target="www/config.xml" parent="/widget/rim:permissions">
- <rim:permit>access_shared</rim:permit>
- <rim:permit>use_camera</rim:permit>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- <asset src="www/blackberry10/assets" target="chrome" />
- </platform>
-
- <!-- wp7 -->
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="wp-package" value="Camera"/>
- </feature>
- </config-file>
-
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_ISV_CAMERA" />
- <Capability Name="ID_CAP_MEDIALIB" />
- </config-file>
-
- <source-file src="src/wp/Camera.cs" />
-
-
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- </platform>
-
- <!-- wp8 -->
- <platform name="wp8">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="wp-package" value="Camera"/>
- </feature>
- </config-file>
-
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_ISV_CAMERA" />
- <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
- </config-file>
-
- <source-file src="src/wp/Camera.cs" />
-
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- </platform>
-
- <!-- windows8 -->
- <platform name="windows8">
-
- <config-file target="package.appxmanifest" parent="/Package/Capabilities">
- <Capability Name="picturesLibrary" />
- <DeviceCapability Name="webcam" />
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
- <runs />
- </js-module>
-
- </platform>
-
- <!-- browser -->
- <platform name="browser">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="browser-package" value="Camera" />
- </feature>
- </config-file>
-
- <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
- <runs />
- </js-module>
- </platform>
-
- <!-- windows -->
- <platform name="windows">
- <config-file target="package.appxmanifest" parent="/Package/Capabilities">
- <DeviceCapability Name="webcam" />
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle" />
- </js-module>
- <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
- <runs />
- </js-module>
- </platform>
-
-
-
+ </platform>
+ <platform name="ubuntu">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param policy_group="camera" policy_version="1"/>
+ </feature>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ <header-file src="src/ubuntu/camera.h"/>
+ <source-file src="src/ubuntu/camera.cpp"/>
+ <resource-file src="src/ubuntu/back.png"/>
+ <resource-file src="src/ubuntu/CaptureWidget.qml"/>
+ <resource-file src="src/ubuntu/shoot.png"/>
+ <resource-file src="src/ubuntu/toolbar-left.png"/>
+ <resource-file src="src/ubuntu/toolbar-middle.png"/>
+ <resource-file src="src/ubuntu/toolbar-right.png"/>
+ </platform>
+ <platform name="ios">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="ios-package" value="CDVCamera"/>
+ </feature>
+ <preference name="CameraUsesGeolocation" value="false"/>
+ </config-file>
+ <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
+ <string>$CAMERA_USAGE_DESCRIPTION</string>
+ </config-file>
+ <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
+ <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
+ </config-file>
+ <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
+ <string/>
+ </config-file>
+ <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ <header-file src="src/ios/UIImage+CropScaleOrientation.h"/>
+ <header-file src="src/ios/CDVCamera.h"/>
+ <header-file src="src/ios/CDVJpegHeaderWriter.h"/>
+ <header-file src="src/ios/CDVExif.h"/>
+ <source-file src="src/ios/UIImage+CropScaleOrientation.m"/>
+ <source-file src="src/ios/CDVCamera.m"/>
+ <source-file src="src/ios/CDVJpegHeaderWriter.m"/>
+ <framework src="ImageIO.framework" weak="true"/>
+ <framework src="CoreLocation.framework"/>
+ <framework src="CoreGraphics.framework"/>
+ <framework src="AssetsLibrary.framework"/>
+ <framework src="MobileCoreServices.framework"/>
+ <framework src="CoreGraphics.framework"/>
+ <framework src="AVFoundation.framework"/>
+ <preference name="CAMERA_USAGE_DESCRIPTION" default=" "/>
+ <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" "/>
+ </platform>
+ <platform name="blackberry10">
+ <source-file src="src/blackberry10/index.js" target-dir="Camera"/>
+ <config-file target="www/config.xml" parent="/widget">
+ <feature name="Camera" value="Camera"/>
+ </config-file>
+ <config-file target="www/config.xml" parent="/widget/rim:permissions">
+ <rim:permit>access_shared</rim:permit>
+ <rim:permit>use_camera</rim:permit>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ <asset src="www/blackberry10/assets" target="chrome"/>
+ </platform>
+ <platform name="wp7">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="wp-package" value="Camera"/>
+ </feature>
+ </config-file>
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_ISV_CAMERA"/>
+ <Capability Name="ID_CAP_MEDIALIB"/>
+ </config-file>
+ <source-file src="src/wp/Camera.cs"/>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ </platform>
+ <platform name="wp8">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="wp-package" value="Camera"/>
+ </feature>
+ </config-file>
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_ISV_CAMERA"/>
+ <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
+ </config-file>
+ <source-file src="src/wp/Camera.cs"/>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ </platform>
+ <platform name="windows8">
+ <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+ <Capability Name="picturesLibrary"/>
+ <DeviceCapability Name="webcam"/>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
+ <runs/>
+ </js-module>
+ </platform>
+ <platform name="browser">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="browser-package" value="Camera"/>
+ </feature>
+ </config-file>
+ <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
+ <runs/>
+ </js-module>
+ </platform>
+ <platform name="windows">
+ <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+ <DeviceCapability Name="webcam"/>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle"/>
+ </js-module>
+ <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
+ <runs/>
+ </js-module>
+ </platform>
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/e4ff41c0/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index eca9722..286f4e6 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,33 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:rim="http://www.blackberry.com/ns/widgets"
- id="cordova-plugin-camera-tests"
- version="2.3.2-dev">
- <name>Cordova Camera Plugin Tests</name>
- <license>Apache 2.0</license>
-
- <dependency id="cordova-plugin-file" version=">=2.0.0" />
-
- <js-module src="tests.js" name="tests">
- </js-module>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera-tests" version="2.4.0">
+ <name>Cordova Camera Plugin Tests</name>
+ <license>Apache 2.0</license>
+ <dependency id="cordova-plugin-file" version=">=2.0.0"/>
+ <js-module src="tests.js" name="tests"/>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[08/12] cordova-plugin-camera git commit: Close #256
Posted by fi...@apache.org.
Close #256
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/eb98015e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/eb98015e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/eb98015e
Branch: refs/heads/2.4.x
Commit: eb98015e8a73c7bc866e77c421db7b81b11a1fcf
Parents: 3c48ea9
Author: filmaj <ma...@gmail.com>
Authored: Mon Apr 24 16:40:08 2017 -0700
Committer: filmaj <ma...@gmail.com>
Committed: Mon Apr 24 16:40:08 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[07/12] cordova-plugin-camera git commit: Close #258
Posted by fi...@apache.org.
Close #258
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/3c48ea9c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/3c48ea9c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/3c48ea9c
Branch: refs/heads/2.4.x
Commit: 3c48ea9c9c452c6fa0326f666622656ebfa4d161
Parents: 2286bb3
Author: filmaj <ma...@gmail.com>
Authored: Mon Apr 24 16:30:53 2017 -0700
Committer: filmaj <ma...@gmail.com>
Committed: Mon Apr 24 16:30:53 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[09/12] cordova-plugin-camera git commit: CB-12650: Fix manual test
for uploading image
Posted by fi...@apache.org.
CB-12650: Fix manual test for uploading image
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/a33c3515
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/a33c3515
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/a33c3515
Branch: refs/heads/2.4.x
Commit: a33c35152e806811350a1e1aff35a6e5e0a27249
Parents: eb98015
Author: Nikita Matrosov <v-...@microsoft.com>
Authored: Wed Apr 12 16:54:39 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Tue Apr 25 15:25:20 2017 +0300
----------------------------------------------------------------------
tests/plugin.xml | 2 +-
tests/tests.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/a33c3515/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index f7e902a..7b39371 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -26,7 +26,7 @@
<name>Cordova Camera Plugin Tests</name>
<license>Apache 2.0</license>
- <dependency id="cordova-plugin-file" version=">=2.0.0" />
+ <dependency id="cordova-plugin-file-transfer" />
<js-module src="tests.js" name="tests">
</js-module>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/a33c3515/tests/tests.js
----------------------------------------------------------------------
diff --git a/tests/tests.js b/tests/tests.js
index 222a839..0c85188 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -177,7 +177,7 @@ exports.defineManualTests = function (contentEl, createActionButton) {
ft.onprogress = function (progressEvent) {
console.log('progress: ' + progressEvent.loaded + ' of ' + progressEvent.total);
};
- var server = "http://cordova-filetransfer.jitsu.com";
+ var server = "http://sheltered-retreat-43956.herokuapp.com";
ft.upload(pictureUrl, server + '/upload', win, fail, options);
function win(information_back) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[02/12] cordova-plugin-camera git commit: Set VERSION to 2.4.1-dev
(via coho)
Posted by fi...@apache.org.
Set VERSION to 2.4.1-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/926fbf0e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/926fbf0e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/926fbf0e
Branch: refs/heads/2.4.x
Commit: 926fbf0e8ccce6f70c34520e507dc9c08dd15f6f
Parents: e4ff41c
Author: Steve Gill <st...@gmail.com>
Authored: Tue Feb 28 17:55:56 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Mar 2 15:44:42 2017 -0800
----------------------------------------------------------------------
package.json | 2 +-
plugin.xml | 477 +++++++++++++++++++++++++++++---------------------
tests/plugin.xml | 38 +++-
3 files changed, 314 insertions(+), 203 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4bac73c..c1fdea7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-camera",
- "version": "2.4.0",
+ "version": "2.4.1-dev",
"description": "Cordova Camera Plugin",
"types": "./types/index.d.ts",
"cordova": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index f1684d9..d363e3a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,200 +1,285 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera" version="2.4.0">
- <name>Camera</name>
- <description>Cordova Camera Plugin</description>
- <license>Apache 2.0</license>
- <keywords>cordova,camera</keywords>
- <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
- <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
- <dependency id="cordova-plugin-compat" version="^1.1.0"/>
- <js-module src="www/CameraConstants.js" name="Camera">
- <clobbers target="Camera"/>
- </js-module>
- <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
- <clobbers target="CameraPopoverOptions"/>
- </js-module>
- <js-module src="www/Camera.js" name="camera">
- <clobbers target="navigator.camera"/>
- </js-module>
- <platform name="firefoxos">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="firefoxos-package" value="Camera"/>
- </feature>
- </config-file>
- <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
- <runs/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:rim="http://www.blackberry.com/ns/widgets"
+ id="cordova-plugin-camera"
+ version="2.4.1-dev">
+ <name>Camera</name>
+ <description>Cordova Camera Plugin</description>
+ <license>Apache 2.0</license>
+ <keywords>cordova,camera</keywords>
+ <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git</repo>
+ <issue>https://issues.apache.org/jira/browse/CB/component/12320645</issue>
+
+ <dependency id="cordova-plugin-compat" version="^1.1.0" />
+
+ <js-module src="www/CameraConstants.js" name="Camera">
+ <clobbers target="Camera" />
</js-module>
- </platform>
- <platform name="android">
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
- </feature>
- </config-file>
- <config-file target="AndroidManifest.xml" parent="/*">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- </config-file>
- <config-file target="AndroidManifest.xml" parent="application">
- <provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">
- <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>
- </provider>
- </config-file>
- <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera"/>
- <source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera"/>
- <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera"/>
- <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera"/>
- <source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml"/>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
+
+ <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
+ <clobbers target="CameraPopoverOptions" />
</js-module>
- <framework src="com.android.support:support-v4:24.1.1+"/>
- </platform>
- <platform name="amazon-fireos">
- <config-file target="res/xml/config.xml" parent="/*">
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
- </feature>
- </config-file>
- <config-file target="AndroidManifest.xml" parent="/*">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- </config-file>
- <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"/>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
+
+
+
+ <js-module src="www/Camera.js" name="camera">
+ <clobbers target="navigator.camera" />
</js-module>
- </platform>
- <platform name="ubuntu">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param policy_group="camera" policy_version="1"/>
- </feature>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- <header-file src="src/ubuntu/camera.h"/>
- <source-file src="src/ubuntu/camera.cpp"/>
- <resource-file src="src/ubuntu/back.png"/>
- <resource-file src="src/ubuntu/CaptureWidget.qml"/>
- <resource-file src="src/ubuntu/shoot.png"/>
- <resource-file src="src/ubuntu/toolbar-left.png"/>
- <resource-file src="src/ubuntu/toolbar-middle.png"/>
- <resource-file src="src/ubuntu/toolbar-right.png"/>
- </platform>
- <platform name="ios">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="ios-package" value="CDVCamera"/>
- </feature>
- <preference name="CameraUsesGeolocation" value="false"/>
- </config-file>
- <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
- <string>$CAMERA_USAGE_DESCRIPTION</string>
- </config-file>
- <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
- <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
- </config-file>
- <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
- <string/>
- </config-file>
- <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- <header-file src="src/ios/UIImage+CropScaleOrientation.h"/>
- <header-file src="src/ios/CDVCamera.h"/>
- <header-file src="src/ios/CDVJpegHeaderWriter.h"/>
- <header-file src="src/ios/CDVExif.h"/>
- <source-file src="src/ios/UIImage+CropScaleOrientation.m"/>
- <source-file src="src/ios/CDVCamera.m"/>
- <source-file src="src/ios/CDVJpegHeaderWriter.m"/>
- <framework src="ImageIO.framework" weak="true"/>
- <framework src="CoreLocation.framework"/>
- <framework src="CoreGraphics.framework"/>
- <framework src="AssetsLibrary.framework"/>
- <framework src="MobileCoreServices.framework"/>
- <framework src="CoreGraphics.framework"/>
- <framework src="AVFoundation.framework"/>
- <preference name="CAMERA_USAGE_DESCRIPTION" default=" "/>
- <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" "/>
- </platform>
- <platform name="blackberry10">
- <source-file src="src/blackberry10/index.js" target-dir="Camera"/>
- <config-file target="www/config.xml" parent="/widget">
- <feature name="Camera" value="Camera"/>
- </config-file>
- <config-file target="www/config.xml" parent="/widget/rim:permissions">
- <rim:permit>access_shared</rim:permit>
- <rim:permit>use_camera</rim:permit>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- <asset src="www/blackberry10/assets" target="chrome"/>
- </platform>
- <platform name="wp7">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="wp-package" value="Camera"/>
- </feature>
- </config-file>
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_ISV_CAMERA"/>
- <Capability Name="ID_CAP_MEDIALIB"/>
- </config-file>
- <source-file src="src/wp/Camera.cs"/>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- </platform>
- <platform name="wp8">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="wp-package" value="Camera"/>
- </feature>
- </config-file>
- <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
- <Capability Name="ID_CAP_ISV_CAMERA"/>
- <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
- </config-file>
- <source-file src="src/wp/Camera.cs"/>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- </platform>
- <platform name="windows8">
- <config-file target="package.appxmanifest" parent="/Package/Capabilities">
- <Capability Name="picturesLibrary"/>
- <DeviceCapability Name="webcam"/>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
- <runs/>
- </js-module>
- </platform>
- <platform name="browser">
- <config-file target="config.xml" parent="/*">
- <feature name="Camera">
- <param name="browser-package" value="Camera"/>
- </feature>
- </config-file>
- <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
- <runs/>
- </js-module>
- </platform>
- <platform name="windows">
- <config-file target="package.appxmanifest" parent="/Package/Capabilities">
- <DeviceCapability Name="webcam"/>
- </config-file>
- <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
- <clobbers target="CameraPopoverHandle"/>
- </js-module>
- <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
- <runs/>
- </js-module>
- </platform>
+
+ <!-- firefoxos -->
+ <platform name="firefoxos">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="firefoxos-package" value="Camera" />
+ </feature>
+ </config-file>
+
+ <js-module src="src/firefoxos/CameraProxy.js" name="CameraProxy">
+ <runs />
+ </js-module>
+ </platform>
+
+ <!-- android -->
+ <platform name="android">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
+ </feature>
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="/*">
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="application">
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="${applicationId}.provider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/provider_paths"/>
+ </provider>
+ </config-file>
+
+ <source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/CordovaUri.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/ExifHelper.java" target-dir="src/org/apache/cordova/camera" />
+ <source-file src="src/android/xml/provider_paths.xml" target-dir="res/xml" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+
+ <framework src="com.android.support:support-v4:24.1.1+" />
+
+ </platform>
+
+ <!-- amazon-fireos -->
+ <platform name="amazon-fireos">
+ <config-file target="res/xml/config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.camera.CameraLauncher"/>
+ </feature>
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="/*">
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ </config-file>
+
+ <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" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+
+ </platform>
+
+ <!-- ubuntu -->
+ <platform name="ubuntu">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param policy_group="camera" policy_version="1" />
+ </feature>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ <header-file src="src/ubuntu/camera.h" />
+ <source-file src="src/ubuntu/camera.cpp" />
+
+ <resource-file src="src/ubuntu/back.png" />
+ <resource-file src="src/ubuntu/CaptureWidget.qml" />
+ <resource-file src="src/ubuntu/shoot.png" />
+ <resource-file src="src/ubuntu/toolbar-left.png" />
+ <resource-file src="src/ubuntu/toolbar-middle.png" />
+ <resource-file src="src/ubuntu/toolbar-right.png" />
+ </platform>
+
+ <!-- ios -->
+ <platform name="ios">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="ios-package" value="CDVCamera" />
+ </feature>
+ <preference name="CameraUsesGeolocation" value="false" />
+ </config-file>
+
+ <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+
+ <header-file src="src/ios/UIImage+CropScaleOrientation.h" />
+ <source-file src="src/ios/UIImage+CropScaleOrientation.m" />
+ <header-file src="src/ios/CDVCamera.h" />
+ <source-file src="src/ios/CDVCamera.m" />
+ <header-file src="src/ios/CDVJpegHeaderWriter.h" />
+ <source-file src="src/ios/CDVJpegHeaderWriter.m" />
+ <header-file src="src/ios/CDVExif.h" />
+ <framework src="ImageIO.framework" weak="true" />
+ <framework src="CoreLocation.framework" />
+ <framework src="CoreGraphics.framework" />
+ <framework src="AssetsLibrary.framework" />
+ <framework src="MobileCoreServices.framework" />
+ <framework src="CoreGraphics.framework" />
+ <framework src="AVFoundation.framework" />
+
+ <preference name="CAMERA_USAGE_DESCRIPTION" default=" " />
+ <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
+ <string>$CAMERA_USAGE_DESCRIPTION</string>
+ </config-file>
+
+ <preference name="PHOTOLIBRARY_USAGE_DESCRIPTION" default=" " />
+ <config-file target="*-Info.plist" parent="NSPhotoLibraryUsageDescription">
+ <string>$PHOTOLIBRARY_USAGE_DESCRIPTION</string>
+ </config-file>
+
+ <config-file target="*-Info.plist" parent="NSLocationWhenInUseUsageDescription">
+ <string></string>
+ </config-file>
+
+ </platform>
+
+ <!-- blackberry10 -->
+ <platform name="blackberry10">
+ <source-file src="src/blackberry10/index.js" target-dir="Camera" />
+ <config-file target="www/config.xml" parent="/widget">
+ <feature name="Camera" value="Camera"/>
+ </config-file>
+ <config-file target="www/config.xml" parent="/widget/rim:permissions">
+ <rim:permit>access_shared</rim:permit>
+ <rim:permit>use_camera</rim:permit>
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ <asset src="www/blackberry10/assets" target="chrome" />
+ </platform>
+
+ <!-- wp7 -->
+ <platform name="wp7">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="wp-package" value="Camera"/>
+ </feature>
+ </config-file>
+
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_ISV_CAMERA" />
+ <Capability Name="ID_CAP_MEDIALIB" />
+ </config-file>
+
+ <source-file src="src/wp/Camera.cs" />
+
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ </platform>
+
+ <!-- wp8 -->
+ <platform name="wp8">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="wp-package" value="Camera"/>
+ </feature>
+ </config-file>
+
+ <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+ <Capability Name="ID_CAP_ISV_CAMERA" />
+ <Capability Name="ID_CAP_MEDIALIB_PHOTO"/>
+ </config-file>
+
+ <source-file src="src/wp/Camera.cs" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ </platform>
+
+ <!-- windows8 -->
+ <platform name="windows8">
+
+ <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+ <Capability Name="picturesLibrary" />
+ <DeviceCapability Name="webcam" />
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
+ <runs />
+ </js-module>
+
+ </platform>
+
+ <!-- browser -->
+ <platform name="browser">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Camera">
+ <param name="browser-package" value="Camera" />
+ </feature>
+ </config-file>
+
+ <js-module src="src/browser/CameraProxy.js" name="CameraProxy">
+ <runs />
+ </js-module>
+ </platform>
+
+ <!-- windows -->
+ <platform name="windows">
+ <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+ <DeviceCapability Name="webcam" />
+ </config-file>
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
+ <js-module src="src/windows/CameraProxy.js" name="CameraProxy">
+ <runs />
+ </js-module>
+ </platform>
+
+
+
</plugin>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/926fbf0e/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 286f4e6..f7e902a 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,7 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:rim="http://www.blackberry.com/ns/widgets" id="cordova-plugin-camera-tests" version="2.4.0">
- <name>Cordova Camera Plugin Tests</name>
- <license>Apache 2.0</license>
- <dependency id="cordova-plugin-file" version=">=2.0.0"/>
- <js-module src="tests.js" name="tests"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:rim="http://www.blackberry.com/ns/widgets"
+ id="cordova-plugin-camera-tests"
+ version="2.4.1-dev">
+ <name>Cordova Camera Plugin Tests</name>
+ <license>Apache 2.0</license>
+
+ <dependency id="cordova-plugin-file" version=">=2.0.0" />
+
+ <js-module src="tests.js" name="tests">
+ </js-module>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[10/12] cordova-plugin-camera git commit: CB-12622: Updated build
badges in README
Posted by fi...@apache.org.
CB-12622: Updated build badges in README
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/96156208
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/96156208
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/96156208
Branch: refs/heads/2.4.x
Commit: 9615620843e57bd78339d66c57ec8fce51a7fb93
Parents: a33c351
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Wed Apr 26 14:29:16 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Wed Apr 26 14:29:16 2017 +0300
----------------------------------------------------------------------
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/96156208/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f2b4562..436eefd 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ description: Take pictures with the device camera.
# under the License.
-->
-|Android|iOS| Windows 8.1 Store | Windows 8.1 Phone | Windows 10 Store | Travis CI |
-|:-:|:-:|:-:|:-:|:-:|:-:|
-|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-8.1-store,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-buil
d/PLATFORM=windows-8.1-phone,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-camera/)|[](https://travis-ci.org/apache/cordova-plugin-camera)
+|Android 4.4|Android 5.1|Android 6.0|iOS 9.3|iOS 10.0|Windows 10 Store|Travis CI|
+|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-4.4,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-5.1,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=android-6.0,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-bu
ild/PLATFORM=ios-9.3,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=ios-10.0,PLUGIN=cordova-plugin-camera/)|[](http://cordova-ci.cloudapp.net:8080/job/cordova-periodic-build/PLATFORM=windows-10-store,PLUGIN=cordova-plugin-camera/)|[](https://travis-ci.org/apache/cordova-plugin-camera)
# cordova-plugin-camera
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[11/12] cordova-plugin-camera git commit: CB-12736 Updated version
and RELEASENOTES.md for release 2.4.1
Posted by fi...@apache.org.
CB-12736 Updated version and RELEASENOTES.md for release 2.4.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/ba9a803b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ba9a803b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ba9a803b
Branch: refs/heads/2.4.x
Commit: ba9a803b69fa08121177485f29dda8652117dc2c
Parents: 9615620
Author: filmaj <ma...@gmail.com>
Authored: Thu Apr 27 10:26:08 2017 -0700
Committer: filmaj <ma...@gmail.com>
Committed: Thu Apr 27 10:26:08 2017 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 7 +++++++
package.json | 2 +-
plugin.xml | 2 +-
tests/plugin.xml | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9a803b/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 001470e..cbb782c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,13 @@
-->
# Release Notes
+### 2.4.1 (Apr 27, 2017)
+* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) Updated build badges in `README`
+* [CB-12650](https://issues.apache.org/jira/browse/CB-12650) Fix manual test for uploading image
+* [CB-12685](https://issues.apache.org/jira/browse/CB-12685) added `package.json` to tests folder
+* [CB-12622](https://issues.apache.org/jira/browse/CB-12622) (android) Appium tests: Bust **Android** 6 and 7 permission dialogs
+* [CB-12618](https://issues.apache.org/jira/browse/CB-12618) (android) Appium tests: Handle native cling
+
### 2.4.0 (Feb 28, 2017)
* [CB-12501](https://issues.apache.org/jira/browse/CB-12501) **Android**: Appium tests don't use `XPath` selectors anymore
* [CB-12469](https://issues.apache.org/jira/browse/CB-12469) Appium tests can now run on **iOS 10**
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9a803b/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c1fdea7..18e18ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-camera",
- "version": "2.4.1-dev",
+ "version": "2.4.1",
"description": "Cordova Camera Plugin",
"types": "./types/index.d.ts",
"cordova": {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9a803b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d363e3a..b931110 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,7 +22,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:rim="http://www.blackberry.com/ns/widgets"
id="cordova-plugin-camera"
- version="2.4.1-dev">
+ version="2.4.1">
<name>Camera</name>
<description>Cordova Camera Plugin</description>
<license>Apache 2.0</license>
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9a803b/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 7b39371..073ef28 100644
--- 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.4.1-dev">
+ version="2.4.1">
<name>Cordova Camera Plugin Tests</name>
<license>Apache 2.0</license>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[03/12] cordova-plugin-camera git commit: CB-12519 updated incorrect
version in RELEASENOTES
Posted by fi...@apache.org.
CB-12519 updated incorrect version in RELEASENOTES
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/d0b381aa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/d0b381aa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/d0b381aa
Branch: refs/heads/2.4.x
Commit: d0b381aad86ac94042b4cb33fde1b9e9e813e8e1
Parents: 926fbf0
Author: Steve Gill <st...@gmail.com>
Authored: Thu Mar 2 16:06:15 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Mar 2 16:06:15 2017 -0800
----------------------------------------------------------------------
RELEASENOTES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/d0b381aa/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 81eec43..001470e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,7 +20,7 @@
-->
# Release Notes
-### 2.3.2 (Feb 28, 2017)
+### 2.4.0 (Feb 28, 2017)
* [CB-12501](https://issues.apache.org/jira/browse/CB-12501) **Android**: Appium tests don't use `XPath` selectors anymore
* [CB-12469](https://issues.apache.org/jira/browse/CB-12469) Appium tests can now run on **iOS 10**
* [CB-12005](https://issues.apache.org/jira/browse/CB-12005) Changing the `getOrientation` method to return the defined enumerated `EXIF` instead of orientation in degrees for Consistency
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[12/12] cordova-plugin-camera git commit: Merged master --> 2.4.x.
Posted by fi...@apache.org.
Merged master --> 2.4.x.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/03c800b6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/03c800b6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/03c800b6
Branch: refs/heads/2.4.x
Commit: 03c800b6c2ef59f77cd51e480755ffd97fef8964
Parents: d16482d ba9a803
Author: filmaj <ma...@gmail.com>
Authored: Thu Apr 27 10:27:37 2017 -0700
Committer: filmaj <ma...@gmail.com>
Committed: Thu Apr 27 10:27:37 2017 -0700
----------------------------------------------------------------------
README.md | 6 ++--
RELEASENOTES.md | 7 +++++
appium-tests/android/android.spec.js | 46 ++++++++++++++++++++++++++++++-
appium-tests/helpers/cameraHelper.js | 3 ++
package.json | 2 +-
plugin.xml | 2 +-
tests/package.json | 14 ++++++++++
tests/plugin.xml | 4 +--
tests/tests.js | 2 +-
9 files changed, 77 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/03c800b6/plugin.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[04/12] cordova-plugin-camera git commit: CB-12618: (android) Appium
tests: Handle native cling
Posted by fi...@apache.org.
CB-12618: (android) Appium tests: Handle native cling
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/180f7b55
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/180f7b55
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/180f7b55
Branch: refs/heads/2.4.x
Commit: 180f7b5510a7055e11ae7c13c7ea54c4d95f7ebb
Parents: d0b381a
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Thu Mar 30 17:52:15 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Thu Mar 30 17:52:15 2017 +0300
----------------------------------------------------------------------
appium-tests/android/android.spec.js | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/180f7b55/appium-tests/android/android.spec.js
----------------------------------------------------------------------
diff --git a/appium-tests/android/android.spec.js b/appium-tests/android/android.spec.js
index 6b259c3..34e65b5 100644
--- a/appium-tests/android/android.spec.js
+++ b/appium-tests/android/android.spec.js
@@ -610,6 +610,15 @@ describe('Camera tests Android.', function () {
.deviceKeyEvent(BACK_BUTTON)
.elementById('Apps')
.click()
+ .then(function () {
+ return driver
+ .elementByXPath('//android.widget.Button[@text="OK"]')
+ .click()
+ .fail(function () {
+ // no cling is all right
+ // it is not a brand new emulator, then
+ });
+ })
.elementByAndroidUIAutomator('new UiSelector().text("Gallery")')
.click()
.elementByAndroidUIAutomator('new UiSelector().textContains("Pictures")')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[05/12] cordova-plugin-camera git commit: CB-12622: (android) Appium
tests: Bust Android 6 and 7 permission dialogs
Posted by fi...@apache.org.
CB-12622: (android) Appium tests: Bust Android 6 and 7 permission dialogs
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/9badea4c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/9badea4c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/9badea4c
Branch: refs/heads/2.4.x
Commit: 9badea4c9509d8d40f17530fb84ea49f223fc925
Parents: 180f7b5
Author: Alexander Sorokin <al...@akvelon.com>
Authored: Thu Apr 20 09:01:54 2017 +0300
Committer: Alexander Sorokin <al...@akvelon.com>
Committed: Thu Apr 20 14:58:03 2017 +0300
----------------------------------------------------------------------
appium-tests/android/android.spec.js | 37 ++++++++++++++++++++++++++++++-
appium-tests/helpers/cameraHelper.js | 3 +++
2 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/9badea4c/appium-tests/android/android.spec.js
----------------------------------------------------------------------
diff --git a/appium-tests/android/android.spec.js b/appium-tests/android/android.spec.js
index 34e65b5..69f7e35 100644
--- a/appium-tests/android/android.spec.js
+++ b/appium-tests/android/android.spec.js
@@ -225,6 +225,40 @@ describe('Camera tests Android.', function () {
})
.waitForDeviceReady()
.injectLibraries()
+ .then(function () {
+ var options = {
+ quality: 50,
+ allowEdit: false,
+ sourceType: cameraConstants.PictureSourceType.SAVEDPHOTOALBUM,
+ saveToPhotoAlbum: false,
+ targetWidth: 210,
+ targetHeight: 210
+ };
+ return driver
+ .then(function () { return getPicture(options, true); })
+ .context(CONTEXT_NATIVE_APP)
+ // case insensitive select, will be handy with Android 7 support
+ .elementByXPath('//android.widget.Button[translate(@text, "alow", "ALOW")="ALLOW"]')
+ .click()
+ .fail(function noAlert() { })
+ .deviceKeyEvent(BACK_BUTTON)
+ .sleep(2000)
+ .elementById('action_bar_title')
+ .then(function () {
+ // success means we're still in native app
+ return driver
+ .deviceKeyEvent(BACK_BUTTON);
+ }, function () {
+ // error means we're already in webview
+ return driver;
+ });
+ })
+ .then(function () {
+ // doing it inside a function because otherwise
+ // it would not hook up to the webviewContext var change
+ // in the first methods of this chain
+ return driver.context(webviewContext);
+ })
.deleteFillerImage(fillerImagePath)
.then(function () {
fillerImagePath = null;
@@ -291,6 +325,7 @@ describe('Camera tests Android.', function () {
pending('This test requires a functioning camera on the Android device/emulator, and this test suite\'s functional camera test failed on your target environment.');
}
}
+
afterAll(function (done) {
checkSession(done);
driver
@@ -390,7 +425,7 @@ describe('Camera tests Android.', function () {
return driver
.elementByAndroidUIAutomator('new UiSelector().text("Choose video")')
.fail(function () {
- throw 'Couldn\'t find "Choose video" element.';
+ throw 'Couldn\'t find a "Choose video" element.';
});
})
.deviceKeyEvent(BACK_BUTTON)
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/9badea4c/appium-tests/helpers/cameraHelper.js
----------------------------------------------------------------------
diff --git a/appium-tests/helpers/cameraHelper.js b/appium-tests/helpers/cameraHelper.js
index a16916f..caf0f9e 100644
--- a/appium-tests/helpers/cameraHelper.js
+++ b/appium-tests/helpers/cameraHelper.js
@@ -169,6 +169,7 @@ module.exports.checkPicture = function (pid, options, cb) {
return;
}
}
+
try {
if (result.indexOf('file:') === 0 ||
result.indexOf('content:') === 0 ||
@@ -184,6 +185,8 @@ module.exports.checkPicture = function (pid, options, cb) {
} else {
verifyFile(entry);
}
+ }, function (err) {
+ errorCallback(err);
});
} else {
displayImage(result);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[06/12] cordova-plugin-camera git commit: CB-12685: added
package.json to tests folder
Posted by fi...@apache.org.
CB-12685: added package.json to tests folder
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/2286bb3b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/2286bb3b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/2286bb3b
Branch: refs/heads/2.4.x
Commit: 2286bb3bb2d32dcff0c98099eabd78ea3bf0137a
Parents: 9badea4
Author: Steve Gill <st...@gmail.com>
Authored: Fri Apr 21 18:15:33 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Apr 21 18:15:33 2017 -0700
----------------------------------------------------------------------
tests/package.json | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/2286bb3b/tests/package.json
----------------------------------------------------------------------
diff --git a/tests/package.json b/tests/package.json
new file mode 100644
index 0000000..646e22c
--- /dev/null
+++ b/tests/package.json
@@ -0,0 +1,14 @@
+{
+ "name": "cordova-plugin-camera-tests",
+ "version": "2.4.1-dev",
+ "description": "",
+ "cordova": {
+ "id": "cordova-plugin-camera-tests",
+ "platforms": []
+ },
+ "keywords": [
+ "ecosystem:cordova"
+ ],
+ "author": "",
+ "license": "Apache 2.0"
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org