diff --git a/framework/src/org/apache/cordova/Capture.java b/framework/src/org/apache/cordova/Capture.java index ca81b005..98bc6d4f 100644 --- a/framework/src/org/apache/cordova/Capture.java +++ b/framework/src/org/apache/cordova/Capture.java @@ -360,8 +360,7 @@ public class Capture extends Plugin { try { // File properties obj.put("name", fp.getName()); - obj.put("fullPath", fp.getAbsolutePath()); - + obj.put("fullPath", "file://" + fp.getAbsolutePath()); // Because of an issue with MimeTypeMap.getMimeTypeFromExtension() all .3gpp files // are reported as video/3gpp. I'm doing this hacky check of the URI to see if it // is stored in the audio or video content store. diff --git a/framework/src/org/apache/cordova/ContactAccessorSdk5.java b/framework/src/org/apache/cordova/ContactAccessorSdk5.java index cb673e40..51eeda50 100644 --- a/framework/src/org/apache/cordova/ContactAccessorSdk5.java +++ b/framework/src/org/apache/cordova/ContactAccessorSdk5.java @@ -437,7 +437,7 @@ public class ContactAccessorSdk5 extends ContactAccessor { contact.put("ims", ims); } if (websites.length() > 0) { - contact.put("websites", websites); + contact.put("urls", websites); } if (photos.length() > 0) { contact.put("photos", photos); @@ -447,20 +447,25 @@ public class ContactAccessorSdk5 extends ContactAccessor { } return contact; } + catch (JSONException e) { + Log.e(LOG_TAG,e.getMessage(),e); + } + return contact; + } - /** - * Take the search criteria passed into the method and create a SQL WHERE clause. - * @param fields the properties to search against - * @param searchTerm the string to search for - * @return an object containing the selection and selection args - */ - private WhereOptions buildWhereClause(JSONArray fields, String searchTerm) { - - ArrayList where = new ArrayList(); - ArrayList whereArgs = new ArrayList(); - - WhereOptions options = new WhereOptions(); + /** + * Take the search criteria passed into the method and create a SQL WHERE clause. + * @param fields the properties to search against + * @param searchTerm the string to search for + * @return an object containing the selection and selection args + */ + private WhereOptions buildWhereClause(JSONArray fields, String searchTerm) { + ArrayList where = new ArrayList(); + ArrayList whereArgs = new ArrayList(); + + WhereOptions options = new WhereOptions(); + /* * Special case where the user wants all fields returned */