Updated Branches: refs/heads/CordovaWebView 43df9f6b9 -> e7411e826
Merge commit of changes on 1.8 Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/e7411e82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e7411e82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e7411e82 Branch: refs/heads/CordovaWebView Commit: e7411e826071146fc09d78306c759999c5db11d7 Parents: 59f9b6f 5f93a26 Author: Joe Bowser <bows...@apache.org> Authored: Wed May 30 14:45:45 2012 -0700 Committer: Joe Bowser <bows...@apache.org> Committed: Wed May 30 14:45:45 2012 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/Capture.java | 3 +- .../org/apache/cordova/ContactAccessorSdk5.java | 35 ++++++++------ 2 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e7411e82/framework/src/org/apache/cordova/Capture.java ---------------------------------------------------------------------- diff --cc framework/src/org/apache/cordova/Capture.java index ca81b00,9809ed1..98bc6d4 --- a/framework/src/org/apache/cordova/Capture.java +++ b/framework/src/org/apache/cordova/Capture.java @@@ -357,11 -350,11 +357,10 @@@ public class Capture extends Plugin File fp = new File(FileUtils.getRealPathFromURI(data, this.ctx)); JSONObject obj = new JSONObject(); - try { + 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. http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e7411e82/framework/src/org/apache/cordova/ContactAccessorSdk5.java ---------------------------------------------------------------------- diff --cc framework/src/org/apache/cordova/ContactAccessorSdk5.java index cb673e4,2237e7e..51eeda5 --- a/framework/src/org/apache/cordova/ContactAccessorSdk5.java +++ b/framework/src/org/apache/cordova/ContactAccessorSdk5.java @@@ -442,25 -442,26 +442,30 @@@ public class ContactAccessorSdk5 extend if (photos.length() > 0) { contact.put("photos", photos); } + } 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<String> where = new ArrayList<String>(); - ArrayList<String> whereArgs = new ArrayList<String>(); - - WhereOptions options = new WhereOptions(); - + 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<String> where = new ArrayList<String>(); + ArrayList<String> whereArgs = new ArrayList<String>(); + + WhereOptions options = new WhereOptions(); + /* * Special case where the user wants all fields returned */
