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

Merge commit of changes on 1.8

Browse Source
This commit is contained in:
Joe Bowser 2012-05-30 14:45:45 -07:00
commit e7411e8260
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,8 +360,7 @@ public class Capture extends Plugin {
try { try {
// File properties // File properties
obj.put("name", fp.getName()); 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 // 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 // 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. // is stored in the audio or video content store.

31
framework/src/org/apache/cordova/ContactAccessorSdk5.java
View File

@ -437,7 +437,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
contact.put("ims", ims); contact.put("ims", ims);
} }
if (websites.length() > 0) { if (websites.length() > 0) {
contact.put("websites", websites); contact.put("urls", websites);
} }
if (photos.length() > 0) { if (photos.length() > 0) {
contact.put("photos", photos); contact.put("photos", photos);
@ -447,20 +447,25 @@ public class ContactAccessorSdk5 extends ContactAccessor {
} }
return contact; 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. * Take the search criteria passed into the method and create a SQL WHERE clause.
* @param fields the properties to search against * @param fields the properties to search against
* @param searchTerm the string to search for * @param searchTerm the string to search for
* @return an object containing the selection and selection args * @return an object containing the selection and selection args
*/ */
private WhereOptions buildWhereClause(JSONArray fields, String searchTerm) { private WhereOptions buildWhereClause(JSONArray fields, String searchTerm) {
ArrayList<String> where = new ArrayList<String>();
ArrayList<String> whereArgs = new ArrayList<String>();
WhereOptions options = new WhereOptions();
ArrayList<String> where = new ArrayList<String>();
ArrayList<String> whereArgs = new ArrayList<String>();
WhereOptions options = new WhereOptions();
/* /*
* Special case where the user wants all fields returned * Special case where the user wants all fields returned
*/ */