You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/05/28 14:36:43 UTC
webworks commit: Escape double quotes in PIM lib
Updated Branches:
refs/heads/master 1e2f28cba -> abc19147e
Escape double quotes in PIM lib
Reviewed by Bryan Higgins <bh...@blackberry.com>
Tested by Tracy Li <tl...@blackberry.com>
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/abc19147
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/abc19147
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/abc19147
Branch: refs/heads/master
Commit: abc19147e5ffdf8c759562238db2af8c99261ae5
Parents: 1e2f28c
Author: Hasan Ahmad <ha...@blackberry.com>
Authored: Thu May 23 11:47:25 2013 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue May 28 08:38:25 2013 -0400
----------------------------------------------------------------------
.../native/arm/so.le-v7/libpimcontacts.so | Bin 170350 -> 170350 bytes
.../blackberry10/native/device/libpimcontacts.so | Bin 170350 -> 170350 bytes
.../src/blackberry10/native/pim_contacts_qt.cpp | 6 ++++--
.../native/simulator/libpimcontacts.so | Bin 265964 -> 265964 bytes
.../blackberry10/native/x86/so/libpimcontacts.so | Bin 265964 -> 265964 bytes
5 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/abc19147/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/arm/so.le-v7/libpimcontacts.so
----------------------------------------------------------------------
diff --git a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/arm/so.le-v7/libpimcontacts.so b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/arm/so.le-v7/libpimcontacts.so
index f90047f..03efc41 100755
Binary files a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/arm/so.le-v7/libpimcontacts.so and b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/arm/so.le-v7/libpimcontacts.so differ
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/abc19147/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/device/libpimcontacts.so
----------------------------------------------------------------------
diff --git a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/device/libpimcontacts.so b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/device/libpimcontacts.so
index f90047f..03efc41 100644
Binary files a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/device/libpimcontacts.so and b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/device/libpimcontacts.so differ
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/abc19147/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/pim_contacts_qt.cpp
----------------------------------------------------------------------
diff --git a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/pim_contacts_qt.cpp b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/pim_contacts_qt.cpp
index 7c70b48..6bf6609 100644
--- a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/pim_contacts_qt.cpp
+++ b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/pim_contacts_qt.cpp
@@ -673,7 +673,7 @@ std::string PimContactsQt::replaceAll(const std::string& s, const std::string& s
return temp;
}
std::string PimContactsQt::replaceString(const std::string& s) {
- std::string temp = replaceAll(replaceAll(replaceAll(replaceAll(s), "\n", "\\\\n"), "\r", ""), "\t", "\\\\t");
+ std::string temp = replaceAll(replaceAll(replaceAll(replaceAll(replaceAll(s), "\n", "\\\\n"), "\r", ""), "\t", "\\\\t"), "\"", "\"");
return temp;
}
@@ -804,7 +804,9 @@ void PimContactsQt::populateField(const bbpim::Contact& contact, bbpim::Attribut
QString format = "yyyy-MM-dd";
contactItem[typeIter->second] = Json::Value(currentAttr.valueAsDateTime().date().toString(format).toStdString());
} else {
- contactItem[typeIter->second] = Json::Value(currentAttr.value().toStdString());
+ std::string value = currentAttr.value().toStdString();
+ value = replaceString(value);
+ contactItem[typeIter->second] = Json::Value(value);
}
}
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/abc19147/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/simulator/libpimcontacts.so
----------------------------------------------------------------------
diff --git a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/simulator/libpimcontacts.so b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/simulator/libpimcontacts.so
index d6bf514..263e8ba 100644
Binary files a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/simulator/libpimcontacts.so and b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/simulator/libpimcontacts.so differ
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/abc19147/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/x86/so/libpimcontacts.so
----------------------------------------------------------------------
diff --git a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/x86/so/libpimcontacts.so b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/x86/so/libpimcontacts.so
index d6bf514..263e8ba 100755
Binary files a/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/x86/so/libpimcontacts.so and b/blackberry10/plugins/org.apache.cordova.blackberry10.pimlib/src/blackberry10/native/x86/so/libpimcontacts.so differ