FCL/sf/mw/qtextensions: comparison qtmobility/src/versit/qversitcontactimporter

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 return false;
 }
 // First, do the properties with PREF set so they appear first in the contact details
 foreach (const QVersitProperty& property, properties) {
-if (property.parameters().contains(QLatin1String("TYPE"), QLatin1String("PREF")))
+QStringList typeParameters = property.parameters().values(QLatin1String("TYPE"));
+if (typeParameters.contains(QLatin1String("PREF"), Qt::CaseInsensitive))
 importProperty(document, property, contactIndex, contact);
 }
 // ... then, do the rest of the properties.
 foreach (const QVersitProperty& property, properties) {
-if (!property.parameters().contains(QLatin1String("TYPE"), QLatin1String("PREF")))
+QStringList typeParameters = property.parameters().values(QLatin1String("TYPE"));
+if (!typeParameters.contains(QLatin1String("PREF"), Qt::CaseInsensitive))
 importProperty(document, property, contactIndex, contact);
 }
 contact->setType(QContactType::TypeContact);
 QContactManagerEngine::setContactDisplayLabel(contact, QVersitContactImporterPrivate::synthesizedDisplayLabel(*contact));
 } else if (detailDefinitionName == QContactOnlineAccount::DefinitionName) {
 success = createOnlineAccount(property, contact);
 } else if (detailDefinitionName == QContactTag::DefinitionName) {
 success = createTags(property, contact);
 } else if (detailDefinitionName == QContactDisplayLabel::DefinitionName) {
-// This actually sets the QContactName's customLabel field (not QContactDisplayLabel)
 success = createCustomLabel(property, contact);
 } else {
 // Look up mDetailMappings for a simple mapping from property to detail.
 success = createNameValueDetail(property, contact);
 }
 QVariant variant = property.variantValue();
 if (property.valueType() != QVersitProperty::CompoundType
 || variant.type() != QVariant::StringList)
 return false;
 QStringList values = variant.toStringList();
-name.setLastName(takeFirst(values));
+QString value(takeFirst(values));
-name.setFirstName(takeFirst(values));
+if (!value.isEmpty())
-name.setMiddleName(takeFirst(values));
+name.setLastName(value);
-name.setPrefix(takeFirst(values));
+value = takeFirst(values);
-name.setSuffix(takeFirst(values));
+if (!value.isEmpty())
+name.setFirstName(value);
+value = takeFirst(values);
+if (!value.isEmpty())
+name.setMiddleName(value);
+value = takeFirst(values);
+if (!value.isEmpty())
+name.setPrefix(value);
+value = takeFirst(values);
+if (!value.isEmpty())
+name.setSuffix(value);
 saveDetailWithContext(contact, &name, extractContexts(property));
 return true;
 }
 */
 bool QVersitContactImporterPrivate::createPhone(
 const QVersitProperty& property, QContact* contact) const
 {
 QContactPhoneNumber phone;
+QString value(property.value());
+if (value.isEmpty())
+return false;
 phone.setNumber(property.value());
-phone.setSubTypes(extractSubTypes(property));
+QStringList subTypes(extractSubTypes(property));
 if (property.name() == QLatin1String("X-ASSISTANT-TEL"))
-phone.setSubTypes(QContactPhoneNumber::SubTypeAssistant);
+subTypes << QContactPhoneNumber::SubTypeAssistant;
+if (!subTypes.isEmpty())
+phone.setSubTypes(subTypes);
 saveDetailWithContext(contact, &phone, extractContexts(property));
 return true;
 }
 QVariant variant = property.variantValue();
 if (property.valueType() != QVersitProperty::CompoundType
 || variant.type() != QVariant::StringList)
 return false;
 QStringList addressParts = variant.toStringList();
-address.setPostOfficeBox(takeFirst(addressParts));
+QString value(takeFirst(addressParts));
+if (!value.isEmpty())
+address.setPostOfficeBox(value);
 // There is no setter for the Extended Address in QContactAddress:
 if (!addressParts.isEmpty())
 addressParts.removeFirst();
-address.setStreet(takeFirst(addressParts));
+value = takeFirst(addressParts);
-address.setLocality(takeFirst(addressParts));
+if (!value.isEmpty())
-address.setRegion(takeFirst(addressParts));
+address.setStreet(value);
-address.setPostcode(takeFirst(addressParts));
+value = takeFirst(addressParts);
-address.setCountry(takeFirst(addressParts));
+if (!value.isEmpty())
-address.setSubTypes(extractSubTypes(property));
+address.setLocality(value);
+value = takeFirst(addressParts);
+if (!value.isEmpty())
+address.setRegion(value);
+value = takeFirst(addressParts);
+if (!value.isEmpty())
+address.setPostcode(value);
+value = takeFirst(addressParts);
+if (!value.isEmpty())
+address.setCountry(value);
+QStringList subTypes(extractSubTypes(property));
+if (!subTypes.isEmpty())
+address.setSubTypes(subTypes);
 saveDetailWithContext(contact, &address, extractContexts(property));
 return true;
 }
 {
 QVariant variant = property.variantValue();
 if (property.valueType() == QVersitProperty::CompoundType
 && variant.type() == QVariant::StringList) {
 QStringList values = variant.toStringList();
-organization.setName(takeFirst(values));
+QString name(takeFirst(values));
-organization.setDepartment(values);
+if (!name.isEmpty())
+organization.setName(name);
+if (!values.isEmpty())
+organization.setDepartment(values);
 }
 }
 /*!
 * Set the organization logo from \a property.
 bool utc = value.endsWith(QLatin1Char('Z'), Qt::CaseInsensitive);
 if (utc)
 value.chop(1); // take away z from end;
 QDateTime dateTime = parseDateTime(value,QLatin1String("yyyyMMddThhmmss"));
+if (!dateTime.isValid())
+return false;
 if (utc)
 dateTime.setTimeSpec(Qt::UTC);
 timeStamp.setLastModified(dateTime);
 saveDetailWithContext(contact, &timeStamp, extractContexts(property));
 return true;
 }
 /*!
 */
 bool QVersitContactImporterPrivate::createAnniversary(
 const QVersitProperty& property, QContact* contact) const
 {
 QContactAnniversary anniversary;
-QDateTime dateTime =
+QDateTime dateTime = parseDateTime(property.value(), QLatin1String("yyyyMMdd"));
-parseDateTime(property.value(), QLatin1String("yyyyMMdd"));
+if (!dateTime.isValid())
+return false;
 anniversary.setOriginalDate(dateTime.date());
 saveDetailWithContext(contact, &anniversary, extractContexts(property));
 return true;
 }
 /*!
 */
 bool QVersitContactImporterPrivate::createBirthday(
 const QVersitProperty& property, QContact* contact) const
 {
 QContactBirthday bday;
-QDateTime dateTime =
+QDateTime dateTime = parseDateTime(property.value(), QLatin1String("yyyyMMdd"));
-parseDateTime(property.value(), QLatin1String("yyyyMMdd"));
+if (!dateTime.isValid())
+return false;
 bday.setDate(dateTime.date());
 saveDetailWithContext(contact, &bday, extractContexts(property));
 return true;
 }
 /*!
 || variant.type() != QVariant::StringList)
 return false;
 QStringList values = variant.toStringList();
 QStringList contexts = extractContexts(property);
 foreach(const QString& value, values) {
-QContactNickname nickName;
+if (!value.isEmpty()) {
-nickName.setNickname(value);
+QContactNickname nickName;
-saveDetailWithContext(contact, &nickName, contexts);
+nickName.setNickname(value);
+saveDetailWithContext(contact, &nickName, contexts);
+}
 }
 return true;
 }
 /*!
 || variant.type() != QVariant::StringList)
 return false;
 QStringList values = variant.toStringList();
 QStringList contexts = extractContexts(property);
 foreach(const QString& value, values) {
-QContactTag tag;
+if (!value.isEmpty()) {
-tag.setTag(value);
+QContactTag tag;
-saveDetailWithContext(contact, &tag, contexts);
+tag.setTag(value);
+saveDetailWithContext(contact, &tag, contexts);
+}
 }
 return true;
 }
 /*!
 */
 bool QVersitContactImporterPrivate::createOnlineAccount(
 const QVersitProperty& property, QContact* contact) const
 {
 QContactOnlineAccount onlineAccount;
+QString value(property.value());
+if (value.isEmpty())
+return false;
 onlineAccount.setAccountUri(property.value());
 if (property.name() == QLatin1String("X-SIP")) {
 QStringList subTypes = extractSubTypes(property);
-if (subTypes.count() == 0)
+if (subTypes.isEmpty())
 subTypes.append(QContactOnlineAccount::SubTypeSip);
 onlineAccount.setSubTypes(subTypes);
-}
+} else if (property.name() == QLatin1String("X-IMPP") ||
-else if (property.name() == QLatin1String("X-IMPP") ||
+property.name() == QLatin1String("IMPP") ||
-property.name() == QLatin1String("IMPP") ||
+property.name() == QLatin1String("X-JABBER")) {
-property.name() == QLatin1String("X-JABBER")) {
 onlineAccount.setSubTypes(QContactOnlineAccount::SubTypeImpp);
-}
-else {
-// NOP
 }
 saveDetailWithContext(contact, &onlineAccount, extractContexts(property));
 return true;
 }
 QVariant variant = property.variantValue();
 if (property.valueType() != QVersitProperty::CompoundType
 || variant.type() != QVariant::StringList)
 return false;
 QStringList values = variant.toStringList();
-geo.setLongitude(takeFirst(values).toDouble());
+bool ok1;
-geo.setLatitude(takeFirst(values).toDouble());
+geo.setLongitude(takeFirst(values).toDouble(&ok1));
+bool ok2;
-saveDetailWithContext(contact, &geo, extractContexts(property));
+geo.setLatitude(takeFirst(values).toDouble(&ok2));
-return true;
+if (ok1 && ok2) {
+saveDetailWithContext(contact, &geo, extractContexts(property));
+return true;
+} else {
+return false;
+}
 }
 /*!
 * Creates a QContactFamily from \a property
 */
 const QVersitProperty& property, QContact* contact) const
 {
 QString val = property.value();
 QContactFamily family = contact->detail<QContactFamily>();
 if (property.name() == QLatin1String("X-SPOUSE")) {
+if (val.isEmpty())
+return false;
 family.setSpouse(val);
 } else if (property.name() == QLatin1String("X-CHILDREN")) {
 QVariant variant = property.variantValue();
 if (property.valueType() != QVersitProperty::ListType
 || variant.type() != QVariant::StringList)
 return false;
 QStringList values = variant.toStringList();
+if (values.isEmpty())
+return false;
 family.setChildren(values);
+} else {
+return false;
 }
 saveDetailWithContext(contact, &family, extractContexts(property));
 return true;
 }
 * Creates a simple name-value contact detail.
 */
 bool QVersitContactImporterPrivate::createNameValueDetail(
 const QVersitProperty& property, QContact* contact) const
 {
+QString value(property.value());
+if (value.isEmpty())
+return false;
 QPair<QString,QString> nameAndValueType =
 mDetailMappings.value(property.name());
-if (nameAndValueType.first.isEmpty()) {
+if (nameAndValueType.first.isEmpty())
 return false;
-}
 QContactDetail detail(nameAndValueType.first);
-detail.setValue(nameAndValueType.second, property.value());
+detail.setValue(nameAndValueType.second, value);
 saveDetailWithContext(contact, &detail, extractContexts(property));
 return true;
 }
 /*!
-* Creates a simple name-value contact detail.
+* Find an existing QContactName and set the CustomLabel field on it
 */
 bool QVersitContactImporterPrivate::createCustomLabel(
 const QVersitProperty& property, QContact* contact) const
 {
-QContactName name;
+QString label(property.value());
-QContactName existingName = contact->detail<QContactName>();
+if (!label.isEmpty()) {
-if (!existingName.isEmpty()) {
+QContactName name;
-name = existingName;
+QContactName existingName = contact->detail<QContactName>();
-}
+if (!existingName.isEmpty()) {
+name = existingName;
-name.setCustomLabel(property.value());
+}
-saveDetailWithContext(contact, &name, extractContexts(property));
+name.setCustomLabel(property.value());
-return true;
+saveDetailWithContext(contact, &name, extractContexts(property));
+return true;
+} else {
+return false;
+}
 }
 /*!
 * Extracts the list of contexts from \a types
 */
 QStringList QVersitContactImporterPrivate::extractContexts(
 const QVersitProperty& property) const
 {
-QStringList types =
+QStringList types = property.parameters().values(QLatin1String("TYPE"));
-property.parameters().values(QLatin1String("TYPE"));
 QStringList contexts;
 foreach (const QString& type, types) {
-QString value = mContextMappings.value(type);
+QString value = mContextMappings.value(type.toUpper());
 if (value.length() > 0)
 contexts.append(value);
 }
 return contexts;
 }
 * Extracts the list of subtypes from \a property
 */
 QStringList QVersitContactImporterPrivate::extractSubTypes(
 const QVersitProperty& property) const
 {
-QStringList types =
+QStringList types = property.parameters().values(QLatin1String("TYPE"));
-property.parameters().values(QLatin1String("TYPE"));
 QStringList subTypes;
 foreach (const QString& type, types) {
-QString subType = mSubTypeMappings.value(type);
+QString subType = mSubTypeMappings.value(type.toUpper());
 if (subType.length() > 0)
 subTypes += subType;
 }
 return subTypes;
 }
 * Saves \a detail to the \a contact.  Also sets the contexts to \a contexts if it is not empty.
 */
 void QVersitContactImporterPrivate::saveDetailWithContext(
 QContact* contact, QContactDetail* detail, const QStringList& contexts) const
 {
-if (!contexts.isEmpty())
+if (!contexts.isEmpty()) {
 detail->setContexts(contexts);
+}
 contact->saveDetail(detail);
 }
 /*! Synthesize the display label from the name of the contact, or, failing that, the nickname of
 the contact, or failing that, the organisation of the contact.

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411
child 15	1f895d8a5b2b