public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Merge branch 'master' of git://github.com/phonegap/phonegap-android

Browse Source
This commit is contained in:
macdonst 2011-09-10 16:01:35 -04:00
commit 9c0b15f7af
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
framework/src/com/phonegap/CameraLauncher.java
View File

@ -10,6 +10,7 @@ package com.phonegap;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@ -75,6 +76,9 @@ public class CameraLauncher extends Plugin {
try {
if (action.equals("takePicture")) {
int destType = DATA_URL;
this.targetHeight = 0;
this.targetWidth = 0;
if (args.length() > 1) {
destType = args.getInt(1);
}
@ -340,7 +344,30 @@ public class CameraLauncher extends Plugin {
// If sending filename back
else if (destType == FILE_URI) {
this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
// Do we need to scale the returned file
if (this.targetHeight != 0 && this.targetWidth != 0) {
try {
Bitmap bitmap = android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
bitmap = scaleBitmap(bitmap);
String fileName = DirectoryManager.getTempDirectoryPath(ctx) + "/resize.jpg";
OutputStream os = new FileOutputStream(fileName);
bitmap.compress(Bitmap.CompressFormat.JPEG, this.mQuality, os);
os.close();
bitmap.recycle();
bitmap = null;
this.success(new PluginResult(PluginResult.Status.OK, ("file://" + fileName)), this.callbackId);
System.gc();
} catch (Exception e) {
e.printStackTrace();
this.failPicture("Error retrieving image.");
}
}
else {
this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
}
}
}
else if (resultCode == Activity.RESULT_CANCELED) {