#15 Android M (6) compatibility

plugin.xml

@@ -1,7 +1,7 @@
 <?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"
-    id="com.phonegap.plugins.barcodescanner"
-    version="1.3.0">
+                                              xmlns:android="http://schemas.android.com/apk/res/android"
+                                              id="com.phonegap.plugins.barcodescanner"
+                                              version="1.3.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>
@@ -293,7 +293,11 @@
             <string name="wifi_type_label">Type</string>
         </config-file>
 
-        <framework src="com.android.support:support-v4:+" />
+        <!-- This would make the plugin build only with gradle on AB (cordova-android 4),
+             so to remain compatible with older build targets we're bundling the support lib instead (yuk!)..
+             this is a different version (newer) than the one in the PushNotification plugin btw.
+        <framework src="com.android.support:support-v4:+" /-->
+        <source-file src="src/android/android-support-v4.jar" target-dir="libs/"/>
 
         <framework src="src/android/ignorelinterrors.gradle" custom="true" type="gradleReference"/>
 

src/ios/CDVBarcodeScanner.mm

@@ -47,6 +47,8 @@ - (BOOL)shouldAutorotate;
 @interface CDVBarcodeScanner : CDVPlugin {}
 - (NSString*)isScanNotPossible;
 - (void)scan:(CDVInvokedUrlCommand*)command;
+- (void)hasCameraPermission:(CDVInvokedUrlCommand*)command;
+- (void)requestCameraPermission:(CDVInvokedUrlCommand*)command;
 - (void)encode:(CDVInvokedUrlCommand*)command;
 - (void)returnSuccess:(NSString*)scannedText format:(NSString*)format cancelled:(BOOL)cancelled flipped:(BOOL)flipped callback:(NSString*)callback;
 - (void)returnError:(NSString*)message callback:(NSString*)callback;
@@ -124,6 +126,16 @@ - (NSString*)isScanNotPossible {
 }
 
 //--------------------------------------------------------------------------
+- (void)hasCameraPermission:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:YES];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)requestCameraPermission:(CDVInvokedUrlCommand*)command {
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (void)scan:(CDVInvokedUrlCommand*)command {
     CDVbcsProcessor* processor;
     NSString*       callback;

src/wp8/BarcodeScanner.cs

@@ -33,6 +33,16 @@ public void scan(string options)
 			});
 		}
 
+		public void hasCameraPermission(string options)
+		{
+			DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
+		}
+
+		public void requestCameraPermission(string options)
+		{
+			DispatchCommandResult(new PluginResult(PluginResult.Status.OK));
+		}
+
 		public void OnScanFailed(string error)
 		{
 			this.DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, error));