Skip to content
This repository has been archived by the owner on Sep 4, 2019. It is now read-only.

Fixed PR 343138 - Contact fields with Chinese characters are returned as... #660

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Fixed PR 343138 - Contact fields with Chinese characters are returned as... #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/pim.contacts/Contact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Contact.prototype.save = function (onSaveSuccess, onSaveError) {
args._eventId = utils.guid();

saveCallback = function (args) {
var result = JSON.parse(unescape(args.result)),
var result = JSON.parse(unescape(decodeURIComponent(args.result))),
newContact,
errorObj;

Expand Down Expand Up @@ -278,7 +278,7 @@ Contact.prototype.remove = function (onRemoveSuccess, onRemoveError) {
args._eventId = utils.guid();

removeCallback = function (args) {
var result = JSON.parse(unescape(args.result)),
var result = JSON.parse(unescape(decodeURIComponent(args.result))),
errorObj;

if (result._success) {
Expand Down
4 changes: 2 additions & 2 deletions ext/pim.contacts/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ _self.find = function (contactFields, findOptions, onFindSuccess, onFindError) {
}

callback = function (args) {
var result = JSON.parse(unescape(args.result)),
var result = JSON.parse(unescape(decodeURIComponent(args.result))),
contacts = result.contacts,
realContacts = [];

Expand Down Expand Up @@ -149,7 +149,7 @@ _self.invokeContactPicker = function (options, onDone, onCancel, onInvoke) {
}
},
invokeCallback = function (args) {
var result = JSON.parse(unescape(args.result)),
var result = JSON.parse(unescape(decodeURIComponent(args.result))),
error;

if (!result._success) {
Expand Down
74 changes: 42 additions & 32 deletions ext/pim.contacts/native/pim_contacts_qt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ QSet<bbpim::ContactId> PimContactsQt::singleFieldSearch(const Json::Value& searc
QList<bbpim::Contact> results;

contactFilter.setSearchFields(searchFields);
contactFilter.setSearchValue(QString(searchFieldsJson["fieldValue"].asString().c_str()));
contactFilter.setSearchValue(toQString(searchFieldsJson["fieldValue"].asString()));

if (favorite) {
contactFilter.setIsFavourite(favorite);
Expand Down Expand Up @@ -681,6 +681,16 @@ std::string PimContactsQt::replaceString(const std::string& s) {
* Helper functions shared by Find and Save
****************************************************************/

QString PimContactsQt::toQString(std::string const &s)
{
return QString::fromUtf8(s.c_str());
}

std::string PimContactsQt::fromQString(QString const &s)
{
return std::string(s.toUtf8().data());
}

Json::Value PimContactsQt::populateContact(const bbpim::Contact& contact, const Json::Value& contactFields)
{
Json::Value contactItem;
Expand Down Expand Up @@ -787,14 +797,14 @@ void PimContactsQt::populateField(const bbpim::Contact& contact, bbpim::Attribut
if (isContactField) {
val["type"] = Json::Value(typeIter->second);

std::string value = currentAttr.value().toStdString();
std::string value = fromQString(currentAttr.value());
value = replaceString(value);

val["value"] = Json::Value(value);
contactItem.append(val);
} else {
if (isArray) {
std::string value = currentAttr.value().toStdString();
std::string value = fromQString(currentAttr.value());
value = replaceString(value);

val = Json::Value(value);
Expand All @@ -804,12 +814,12 @@ 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());
contactItem[typeIter->second] = Json::Value(fromQString(currentAttr.value()));
}
}
}
} else if (kind == bbpim::AttributeKind::Note) {
std::string note = currentAttr.value().toStdString();
std::string note = fromQString(currentAttr.value());
note = replaceString(note);
contactItem["note"] = Json::Value(note);
break;
Expand All @@ -829,7 +839,7 @@ void PimContactsQt::populateDisplayNameNickName(const bbpim::Contact& contact, J
bbpim::ContactAttribute currentAttr = nameAttrs[i];

if (currentAttr.subKind() == subkind) {
std::string value = currentAttr.value().toStdString();
std::string value = fromQString(currentAttr.value());
value = replaceString(value);
contactItem[field] = Json::Value(value);
break;
Expand All @@ -854,12 +864,12 @@ void PimContactsQt::populateAddresses(const bbpim::Contact& contact, Json::Value
addr["type"] = Json::Value(typeIter->second);
}

addr["streetAddress"] = Json::Value(currentAddr.line1().toStdString());
addr["streetOther"] = Json::Value(currentAddr.line2().toStdString());
addr["country"] = Json::Value(currentAddr.country().toStdString());
addr["locality"] = Json::Value(currentAddr.city().toStdString());
addr["postalCode"] = Json::Value(currentAddr.postalCode().toStdString());
addr["region"] = Json::Value(currentAddr.region().toStdString());
addr["streetAddress"] = Json::Value(fromQString(currentAddr.line1()));
addr["streetOther"] = Json::Value(fromQString(currentAddr.line2()));
addr["country"] = Json::Value(fromQString(currentAddr.country()));
addr["locality"] = Json::Value(fromQString(currentAddr.city()));
addr["postalCode"] = Json::Value(fromQString(currentAddr.postalCode()));
addr["region"] = Json::Value(fromQString(currentAddr.region()));

contactAddrs.append(addr);
}
Expand All @@ -878,7 +888,7 @@ void PimContactsQt::populateOrganizations(const bbpim::Contact& contact, Json::V
SubKindToStringMap::const_iterator typeIter = _subKindAttributeMap.find(attr.subKind());

if (typeIter != _subKindAttributeMap.end()) {
std::string value = attr.value().toStdString();
std::string value = fromQString(attr.value());
value = replaceString(value);
org[typeIter->second] = Json::Value(value);
}
Expand Down Expand Up @@ -918,15 +928,15 @@ void PimContactsQt::populateNews(const bbpim::Contact& contact, Json::Value& con
Json::Value companies;
QString format = "yyyy-MM-dd";

std::string body = k->body().toStdString();
std::string body = fromQString(k->body());
body = replaceString(body);
news["body"] = Json::Value(body);

std::string title = k->title().toStdString();
std::string title = fromQString(k->title());
title = replaceString(title);
news["title"] = Json::Value(title);

std::string articleSource = k->articleSource().toStdString();
std::string articleSource = fromQString(k->articleSource());
articleSource = replaceString(articleSource);
news["articleSource"] = Json::Value(articleSource);

Expand Down Expand Up @@ -957,7 +967,7 @@ void PimContactsQt::populateActivity(const bbpim::Contact& contact, Json::Value&
while (k != activities.constEnd()) {
Json::Value activity;

std::string desc = k->description().toStdString();
std::string desc = fromQString(k->description());
desc = replaceString(desc);

activity["description"] = Json::Value(desc);
Expand Down Expand Up @@ -1256,7 +1266,7 @@ void PimContactsQt::addAttribute(bbpim::ContactBuilder& contactBuilder, const bb
attributeBuilder = attributeBuilder.setValue(QString(value.c_str()));
}
} else {
attributeBuilder = attributeBuilder.setValue(QString(value.c_str()));
attributeBuilder = attributeBuilder.setValue(toQString(value));
}

if (!groupKey.empty()) {
Expand All @@ -1280,12 +1290,12 @@ void PimContactsQt::addPostalAddress(bbpim::ContactBuilder& contactBuilder, cons
}
}

addressBuilder = addressBuilder.setLine1(QString(addressObj.get("streetAddress", "").asCString()));
addressBuilder = addressBuilder.setLine2(QString(addressObj.get("streetOther", "").asCString()));
addressBuilder = addressBuilder.setCity(QString(addressObj.get("locality", "").asCString()));
addressBuilder = addressBuilder.setRegion(QString(addressObj.get("region", "").asCString()));
addressBuilder = addressBuilder.setCountry(QString(addressObj.get("country", "").asCString()));
addressBuilder = addressBuilder.setPostalCode(QString(addressObj.get("postalCode", "").asCString()));
addressBuilder = addressBuilder.setLine1(toQString(addressObj.get("streetAddress", "").asString()));
addressBuilder = addressBuilder.setLine2(toQString(addressObj.get("streetOther", "").asString()));
addressBuilder = addressBuilder.setCity(toQString(addressObj.get("locality", "").asString()));
addressBuilder = addressBuilder.setRegion(toQString(addressObj.get("region", "").asString()));
addressBuilder = addressBuilder.setCountry(toQString(addressObj.get("country", "").asString()));
addressBuilder = addressBuilder.setPostalCode(toQString(addressObj.get("postalCode", "").asString()));

contactBuilder = contactBuilder.addPostalAddress(address);
}
Expand Down Expand Up @@ -1317,7 +1327,7 @@ void PimContactsQt::syncConvertedList(bbpim::ContactBuilder& contactBuilder, bbp
} else {
bbpim::ContactAttributeBuilder attributeBuilder(savedList[index].edit());
attributeBuilder = attributeBuilder.setSubKind(convertedList[index].first);
attributeBuilder = attributeBuilder.setValue(QString(convertedList[index].second.c_str()));
attributeBuilder = attributeBuilder.setValue(toQString(convertedList[index].second));

if (!groupKey.empty()) {
attributeBuilder = attributeBuilder.setGroupKey(QString(groupKey.c_str()));
Expand Down Expand Up @@ -1387,7 +1397,7 @@ void PimContactsQt::syncAttribute(bbpim::ContactBuilder& contactBuilder, QList<b
attributeBuilder = attributeBuilder.setValue(QString(value.c_str()));
}
} else {
attributeBuilder = attributeBuilder.setValue(QString(value.c_str()));
attributeBuilder = attributeBuilder.setValue(toQString(value));

if (!groupKey.empty()) {
attributeBuilder = attributeBuilder.setGroupKey(QString(groupKey.c_str()));
Expand Down Expand Up @@ -1418,12 +1428,12 @@ void PimContactsQt::syncPostalAddresses(bbpim::ContactBuilder& contactBuilder, Q
addressBuilder = addressBuilder.setSubKind(subkindIter->second);
}

addressBuilder = addressBuilder.setLine1(QString(addressObj.get("streetAddress", "").asCString()));
addressBuilder = addressBuilder.setLine2(QString(addressObj.get("streetOther", "").asCString()));
addressBuilder = addressBuilder.setCity(QString(addressObj.get("locality", "").asCString()));
addressBuilder = addressBuilder.setRegion(QString(addressObj.get("region", "").asCString()));
addressBuilder = addressBuilder.setCountry(QString(addressObj.get("country", "").asCString()));
addressBuilder = addressBuilder.setPostalCode(QString(addressObj.get("postalCode", "").asCString()));
addressBuilder = addressBuilder.setLine1(toQString(addressObj.get("streetAddress", "").asString()));
addressBuilder = addressBuilder.setLine2(toQString(addressObj.get("streetOther", "").asString()));
addressBuilder = addressBuilder.setCity(toQString(addressObj.get("locality", "").asString()));
addressBuilder = addressBuilder.setRegion(toQString(addressObj.get("region", "").asString()));
addressBuilder = addressBuilder.setCountry(toQString(addressObj.get("country", "").asString()));
addressBuilder = addressBuilder.setPostalCode(toQString(addressObj.get("postalCode", "").asString()));
}

if (i < savedList.size()) {
Expand Down
3 changes: 3 additions & 0 deletions ext/pim.contacts/native/pim_contacts_qt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ class PimContactsQt {
static Json::Value GetContactAccounts();

private:
static QString toQString(std::string const& s);
static std::string fromQString(QString const& s);

// Helper functions for Find
Json::Value assembleSearchResults(const QSet<bbpim::ContactId>& results, const Json::Value& contactFields, int limit);
Json::Value populateContact(const bbpim::Contact& contact, const Json::Value& contactFields);
Expand Down