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

CB-4471: Mitigating Android 4.3 errors where data isn't being passed so NPE doesn't happen

Browse Source
This commit is contained in:
Joe Bowser 2013-10-16 11:58:07 -07:00
parent cb11486f66
commit cdb49eaa1f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
framework/src/org/apache/cordova/Capture.java
View File

@ -305,14 +305,20 @@ public class Capture extends CordovaPlugin {
// Get the uri of the video clip
Uri data = intent.getData();
// create a file object from the uri
results.put(createMediaFile(data));
if (results.length() >= limit) {
// Send Uri back to JavaScript for viewing video
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
} else {
// still need to capture more video clips
captureVideo(duration);
if(data == null)
{
this.fail(createErrorObject(CAPTURE_NO_MEDIA_FILES, "Error: data is null"));
}
else
{
results.put(createMediaFile(data));
if (results.length() >= limit) {
// Send Uri back to JavaScript for viewing video
this.callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, results));
} else {
// still need to capture more video clips
captureVideo(duration);
}
}
}
}