public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Fix for troublesome values being returned from DroidDB stores. Stick to one level of JSON serialization.

Browse Source
This commit is contained in:
Jos Shepherd 2010-11-05 17:03:05 +00:00
parent 36064c564e
commit fdc78e1b08
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/assets/js/storage.js
View File

@ -27,9 +27,8 @@ var DroidDB = function() {
* @param rawdata JSON string of the row data
* @param id Query id
*/
DroidDB.prototype.addResult = function(rawdata, id) {
DroidDB.prototype.addResult = function(data, id) {
try {
eval("var data = " + rawdata + ";");
var query = this.queryQueue[id];
query.resultSet.push(data);
} catch (e) {

6
framework/src/com/phonegap/Storage.java
View File

@ -172,12 +172,12 @@ public class Storage extends Plugin {
try {
for (int i = 0; i < colCount; ++i) {
key = cur.getColumnName(i);
value = cur.getString(i).replace("\"", "\\\""); // must escape " with \" for JavaScript
value = cur.getString(i);
result.put(key, value);
}
// Send row back to JavaScript
this.sendJavascript("droiddb.addResult('" + result.toString() + "','" + tx_id + "');");
this.sendJavascript("droiddb.addResult(" + result.toString() + ",'" + tx_id + "');");
} catch (JSONException e) {
e.printStackTrace();