You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/09/27 00:24:13 UTC
[02/20] git commit: No longer causes a stack trace,
but it doesn't cause the error to be called.
No longer causes a stack trace, but it doesn't cause the error to be called.
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/118ca18d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/118ca18d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/118ca18d
Branch: refs/heads/master
Commit: 118ca18d5a7d77dfe37c5c9a85350a7890448de9
Parents: 382e942
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Aug 21 15:39:43 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Sep 4 11:34:13 2013 -0700
----------------------------------------------------------------------
src/android/CameraLauncher.java | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/118ca18d/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index ba432cb..02a9211 100755
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -76,7 +76,7 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
private static final String GET_PICTURE = "Get Picture";
private static final String GET_VIDEO = "Get Video";
private static final String GET_All = "Get All";
-
+
private static final String LOG_TAG = "CameraLauncher";
private int mQuality; // Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
@@ -153,15 +153,26 @@ public class CameraLauncher extends CordovaPlugin implements MediaScannerConnect
this.targetHeight = -1;
}
- if (srcType == CAMERA) {
- this.takePicture(destType, encodingType);
+ try {
+ if (srcType == CAMERA) {
+ this.takePicture(destType, encodingType);
+ }
+ else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
+ this.getImage(srcType, destType);
+ }
}
- else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
- this.getImage(srcType, destType);
+ catch (IllegalArgumentException e)
+ {
+ callbackContext.error("Illegal Argument Exception");
+ PluginResult r = new PluginResult(PluginResult.Status.ERROR);
+ callbackContext.sendPluginResult(r);
+ return true;
}
+
PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
r.setKeepCallback(true);
callbackContext.sendPluginResult(r);
+
return true;
}
return false;