Merge branch 'master' into barcodeEncodeBB

Conflicts:
	www/blackberry10/client.js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phonegap-plugin-barcodescanner",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "You can use the BarcodeScanner plugin to scan different types of barcodes (using the device's camera) and get the metadata encoded in them for processing within your application.",
   "cordova": {
     "id": "phonegap-plugin-barcodescanner",

plugin.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:rim="http://www.blackberry.com/ns/widgets"
     id="phonegap-plugin-barcodescanner"
-    version="3.1.2">
+    version="4.1.0">
 
     <name>BarcodeScanner</name>
     <description>You can use the BarcodeScanner plugin to scan different types of barcodes (using the device's camera) and get the metadata encoded in them for processing within your application.</description>

src/blackberry10/index.js

@@ -49,7 +49,7 @@ module.exports = {
 		if (handle !== null) {
 			var values = { group: group, handle: handle };
 			barcodescanner.getInstance().startRead(result.callbackId, values);
-			// result.noResult(true); // calls the error handler for some reason
+			result.noResult(true);
 		} else {
 			result.error("Failed to find window handle", false);
 		}
@@ -165,7 +165,8 @@ JNEXT.BarcodeScanner = function () {
 
 		if (receivedEvent == "community.barcodescanner.codefound.native") {
 			if (result) {
-				result.callbackOk(data, false);
+				var parsed = JSON.parse(data);
+				result.callbackOk(parsed, false);
 			}
 			this.stopRead(callbackId);
 

src/ios/CDVBarcodeScanner.mm

@@ -433,11 +433,11 @@ - (NSString*)setUpCaptureSession {
 
     [output setSampleBufferDelegate:self queue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0)];
 
-    if (![captureSession canSetSessionPreset:AVCaptureSessionPresetMedium]) {
-        return @"unable to preset medium quality video capture";
+    if (![captureSession canSetSessionPreset:AVCaptureSessionPresetHigh]) {
+        return @"unable to preset high quality video capture";
     }
 
-    captureSession.sessionPreset = AVCaptureSessionPresetMedium;
+    captureSession.sessionPreset = AVCaptureSessionPresetHigh;
 
     if ([captureSession canAddInput:input]) {
         [captureSession addInput:input];