Updated Branches: refs/heads/2.9.x df1536ea7 -> c5e83b107
[CB-3998] video duration is an int Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c5e83b10 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c5e83b10 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c5e83b10 Branch: refs/heads/2.9.x Commit: c5e83b10796ec38b80cb748f925584cc7e89b3de Parents: df1536e Author: Don Coleman <dcole...@chariotsolutions.com> Authored: Tue Jun 25 00:29:16 2013 -0400 Committer: Don Coleman <d...@apache.org> Committed: Thu Jun 27 17:39:48 2013 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/Capture.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c5e83b10/framework/src/org/apache/cordova/Capture.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/Capture.java b/framework/src/org/apache/cordova/Capture.java index 5f737ca..e6e9ece 100644 --- a/framework/src/org/apache/cordova/Capture.java +++ b/framework/src/org/apache/cordova/Capture.java @@ -62,7 +62,7 @@ public class Capture extends CordovaPlugin { private CallbackContext callbackContext; // The callback context from which we were invoked. private long limit; // the number of pics/vids/clips to take - private double duration; // optional duration parameter for video recording + private int duration; // optional max duration of video recording in seconds private JSONArray results; // The array of results to be returned to the user private int numPics; // Number of pictures before capture activity @@ -80,13 +80,13 @@ public class Capture extends CordovaPlugin { public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException { this.callbackContext = callbackContext; this.limit = 1; - this.duration = 0.0f; + this.duration = 0; this.results = new JSONArray(); JSONObject options = args.optJSONObject(0); if (options != null) { limit = options.optLong("limit", 1); - duration = options.optDouble("duration", 0.0f); + duration = options.optInt("duration", 0); } if (action.equals("getFormatData")) { @@ -215,10 +215,10 @@ public class Capture extends CordovaPlugin { /** * Sets up an intent to capture video. Result handled by onActivityResult() */ - private void captureVideo(double duration) { + private void captureVideo(int duration) { Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE); - if(Build.VERSION.SDK_INT > 8){ + if(Build.VERSION.SDK_INT > 7){ intent.putExtra("android.intent.extra.durationLimit", duration); } this.cordova.startActivityForResult((CordovaPlugin) this, intent, CAPTURE_VIDEO);
