github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for CB-104: Capture not returning an error code on cancel

Browse Source
This commit is contained in:
macdonst 2011-12-06 06:01:00 +08:00
parent 4b9e50146e
commit f95fdb5873
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
framework/src/com/phonegap/Capture.java
View File

@ -49,6 +49,13 @@ public class Capture extends Plugin {
private static final int CAPTURE_IMAGE = 1; // Constant for capture image private static final int CAPTURE_IMAGE = 1; // Constant for capture image
private static final int CAPTURE_VIDEO = 2; // Constant for capture video private static final int CAPTURE_VIDEO = 2; // Constant for capture video
private static final String LOG_TAG = "Capture"; private static final String LOG_TAG = "Capture";
private static final int CAPTURE_INTERNAL_ERR = 0;
private static final int CAPTURE_APPLICATION_BUSY = 1;
private static final int CAPTURE_INVALID_ARGUMENT = 2;
private static final int CAPTURE_NO_MEDIA_FILES = 3;
private static final int CAPTURE_NOT_SUPPORTED = 20;
private String callbackId; // The ID of the callback to be invoked with our result private String callbackId; // The ID of the callback to be invoked with our result
private long limit; // the number of pics/vids/clips to take private long limit; // the number of pics/vids/clips to take
private double duration; // optional duration parameter for video recording private double duration; // optional duration parameter for video recording
@ -260,7 +267,7 @@ public class Capture extends Plugin {
uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values); uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
} catch (UnsupportedOperationException ex) { } catch (UnsupportedOperationException ex) {
LOG.d(LOG_TAG, "Can't write to internal media storage."); LOG.d(LOG_TAG, "Can't write to internal media storage.");
this.fail("Error capturing image - no media storage found."); this.fail(createErrorObject(CAPTURE_INTERNAL_ERR, "Error capturing image - no media storage found."));
return; return;
} }
} }
@ -290,7 +297,7 @@ public class Capture extends Plugin {
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
this.fail("Error capturing image."); this.fail(createErrorObject(CAPTURE_INTERNAL_ERR, "Error capturing image."));
} }
} else if (requestCode == CAPTURE_VIDEO) { } else if (requestCode == CAPTURE_VIDEO) {
// Get the uri of the video clip // Get the uri of the video clip
@ -315,7 +322,7 @@ public class Capture extends Plugin {
} }
// user canceled the action // user canceled the action
else { else {
this.fail("Canceled."); this.fail(createErrorObject(CAPTURE_NO_MEDIA_FILES, "Canceled."));
} }
} }
// If something else // If something else
@ -326,7 +333,7 @@ public class Capture extends Plugin {
} }
// something bad happened // something bad happened
else { else {
this.fail("Did not complete!"); this.fail(createErrorObject(CAPTURE_NO_MEDIA_FILES, "Did not complete!"));
} }
} }
} }
@ -370,12 +377,23 @@ public class Capture extends Plugin {
return obj; return obj;
} }
private JSONObject createErrorObject(int code, String message) {
JSONObject obj = new JSONObject();
try {
obj.put("code", code);
obj.put("message", message);
} catch (JSONException e) {
// This will never happen
}
return obj;
}
/** /**
* Send error message to JavaScript. * Send error message to JavaScript.
* *
* @param err * @param err
*/ */
public void fail(String err) { public void fail(JSONObject err) {
this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId); this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
} }
} }