From 6c465e25d361f5ef5f61a818507b7fc9166ea49e Mon Sep 17 00:00:00 2001 From: Fil Maj Date: Wed, 20 Jun 2012 11:10:43 -0700 Subject: [PATCH] merge!!!!11one --- framework/src/org/apache/cordova/CameraLauncher.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java index ed0f928c..f2c3e12d 100755 --- a/framework/src/org/apache/cordova/CameraLauncher.java +++ b/framework/src/org/apache/cordova/CameraLauncher.java @@ -81,6 +81,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie private Uri imageUri; // Uri of captured image private int encodingType; // Type of encoding to use private int mediaType; // What type of media to retrieve + private boolean saveToPhotoAlbum; // Should the picture be saved to the device's photo album public String callbackId; private int numPics; @@ -121,6 +122,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie if (action.equals("takePicture")) { int srcType = CAMERA; int destType = FILE_URI; + this.saveToPhotoAlbum = false; this.targetHeight = 0; this.targetWidth = 0; this.encodingType = JPEG; @@ -134,6 +136,7 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie this.targetHeight = args.getInt(4); this.encodingType = args.getInt(5); this.mediaType = args.getInt(6); + this.saveToPhotoAlbum = args.getBoolean(9); if (srcType == CAMERA) { this.takePicture(destType, encodingType);