Merge lp:~renatofilho/address-book-service/fix-1390110-rtm into lp:address-book-service/rtm-14.09

[Renato Araujo Oliveira Filho]

Save address fields in single lines. To avoid problems with folks

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed UI labels, did you update the pot file? NO LABEL

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGED

=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp	2014-10-14 15:45:14 +0000
+++ lib/qindividual.cpp	2015-01-05 17:43:17 +0000
@@ -230,23 +230,23 @@
     if (sn) {
         const char *name = folks_structured_name_get_given_name(sn);
         if (name && strlen(name)) {
-            detail.setFirstName(QString::fromUtf8(name));
+            detail.setFirstName(qStringFromGChar(name));
         }
         name = folks_structured_name_get_additional_names(sn);
         if (name && strlen(name)) {
-            detail.setMiddleName(QString::fromUtf8(name));
+            detail.setMiddleName(qStringFromGChar(name));
         }
         name = folks_structured_name_get_family_name(sn);
         if (name && strlen(name)) {
-            detail.setLastName(QString::fromUtf8(name));
+            detail.setLastName(qStringFromGChar(name));
         }
         name = folks_structured_name_get_prefixes(sn);
         if (name && strlen(name)) {
-            detail.setPrefix(QString::fromUtf8(name));
+            detail.setPrefix(qStringFromGChar(name));
         }
         name = folks_structured_name_get_suffixes(sn);
         if (name && strlen(name)) {
-            detail.setSuffix(QString::fromUtf8(name));
+            detail.setSuffix(qStringFromGChar(name));
         }
         detail.setDetailUri(QString("%1.1").arg(index));
     }
@@ -262,7 +262,7 @@
     QContactDisplayLabel detail;
     const gchar *fullName = folks_name_details_get_full_name(FOLKS_NAME_DETAILS(persona));
     if (fullName) {
-        detail.setLabel(QString::fromUtf8(fullName));
+        detail.setLabel(qStringFromGChar(fullName));
         detail.setDetailUri(QString("%1.1").arg(index));
     }
 
@@ -278,7 +278,7 @@
     QContactNickname detail;
     const gchar* nickname = folks_name_details_get_nickname(FOLKS_NAME_DETAILS(persona));
     if (nickname && strlen(nickname)) {
-        detail.setNickname(QString::fromUtf8(nickname));
+        detail.setNickname(qStringFromGChar(nickname));
         detail.setDetailUri(QString("%1.1").arg(index));
     }
     return detail;
@@ -317,6 +317,11 @@
     }
 }
 
+QString QIndividual::qStringFromGChar(const gchar *str)
+{
+    return QString::fromUtf8(str).remove(QRegExp("[\r\n]"));
+}
+
 QtContacts::QContactDetail QIndividual::getPersonaPhoto(FolksPersona *persona, int index) const
 {
     QContactAvatar avatar;
@@ -399,15 +404,15 @@
         QContactOrganization org;
         QString field;
 
-        field = QString::fromUtf8(folks_role_get_organisation_name(role));
+        field = qStringFromGChar(folks_role_get_organisation_name(role));
         if (!field.isEmpty()) {
             org.setName(field);
         }
-        field = QString::fromUtf8(folks_role_get_title(role));
+        field = qStringFromGChar(folks_role_get_title(role));
         if (!field.isEmpty()) {
             org.setTitle(field);
         }
-        field = QString::fromUtf8(folks_role_get_role(role));
+        field = qStringFromGChar(folks_role_get_role(role));
         if (!field.isEmpty()) {
             org.setRole(field);
         }
@@ -447,7 +452,7 @@
         const gchar *email = (const gchar*) folks_abstract_field_details_get_value(fd);
 
         QContactEmailAddress addr;
-        addr.setEmailAddress(QString::fromUtf8(email));
+        addr.setEmailAddress(qStringFromGChar(email));
         bool isPref = false;
         DetailContextParser::parseParameters(addr, fd, &isPref);
         addr.setDetailUri(QString("%1.%2").arg(index).arg(fieldIndex++));
@@ -483,7 +488,7 @@
         const gchar *phone = (const char*) folks_abstract_field_details_get_value(fd);
 
         QContactPhoneNumber number;
-        number.setNumber(QString::fromUtf8(phone));
+        number.setNumber(qStringFromGChar(phone));
         bool isPref = false;
         DetailContextParser::parseParameters(number, fd, &isPref);
         number.setDetailUri(QString("%1.%2").arg(index).arg(fieldIndex++));
@@ -521,32 +526,32 @@
         QContactAddress address;
         const char *field = folks_postal_address_get_country(addr);
         if (field && strlen(field)) {
-            address.setCountry(QString::fromUtf8(field));
+            address.setCountry(qStringFromGChar(field));
         }
 
         field = folks_postal_address_get_locality(addr);
         if (field && strlen(field)) {
-            address.setLocality(QString::fromUtf8(field));
+            address.setLocality(qStringFromGChar(field));
         }
 
         field = folks_postal_address_get_po_box(addr);
         if (field && strlen(field)) {
-            address.setPostOfficeBox(QString::fromUtf8(field));
+            address.setPostOfficeBox(qStringFromGChar(field));
         }
 
         field = folks_postal_address_get_postal_code(addr);
         if (field && strlen(field)) {
-            address.setPostcode(QString::fromUtf8(field));
+            address.setPostcode(qStringFromGChar(field));
         }
 
         field = folks_postal_address_get_region(addr);
         if (field && strlen(field)) {
-            address.setRegion(QString::fromUtf8(field));
+            address.setRegion(qStringFromGChar(field));
         }
 
         field = folks_postal_address_get_street(addr);
         if (field && strlen(field)) {
-            address.setStreet(QString::fromUtf8(field));
+            address.setStreet(qStringFromGChar(field));
         }
 
         bool isPref = false;
@@ -594,8 +599,8 @@
             }
 
             QContactOnlineAccount account;
-            account.setAccountUri(QString::fromUtf8(uri));
-            int protocolId = DetailContextParser::accountProtocolFromString(QString::fromUtf8(key));
+            account.setAccountUri(qStringFromGChar(uri));
+            int protocolId = DetailContextParser::accountProtocolFromString(qStringFromGChar(key));
             account.setProtocol(static_cast<QContactOnlineAccount::Protocol>(protocolId));
 
             bool isPref = false;
@@ -636,7 +641,7 @@
         const char *url = (const char*) folks_abstract_field_details_get_value(fd);
 
         QContactUrl detail;
-        detail.setUrl(QString::fromUtf8(url));
+        detail.setUrl(qStringFromGChar(url));
         bool isPref = false;
         DetailContextParser::parseParameters(detail, fd, &isPref);
         detail.setDetailUri(QString("%1.%2").arg(index).arg(fieldIndex++));
@@ -780,7 +785,7 @@
     GeeIterator *iter = gee_iterable_iterator(GEE_ITERABLE(personas));
     while(gee_iterator_next(iter)) {
         FolksPersona *persona = FOLKS_PERSONA(gee_iterator_get(iter));
-        m_personas.insert(QString::fromUtf8(folks_persona_get_iid(persona)), persona);
+        m_personas.insert(qStringFromGChar(folks_persona_get_iid(persona)), persona);
     }
 
     g_object_unref(iter);

=== modified file 'lib/qindividual.h'
--- lib/qindividual.h	2014-10-13 19:33:46 +0000
+++ lib/qindividual.h	2015-01-05 17:43:17 +0000
@@ -168,6 +168,8 @@
     static void folksIndividualChanged          (FolksIndividual *individual,
                                                  GParamSpec *pspec,
                                                  QIndividual *self);
+
+    static QString qStringFromGChar             (const gchar *str);
 };
 
 } //namespace

=== modified file 'tests/unittest/qcontacts-test.cpp'
--- tests/unittest/qcontacts-test.cpp	2014-10-13 19:33:46 +0000
+++ tests/unittest/qcontacts-test.cpp	2015-01-05 17:43:17 +0000
@@ -489,6 +489,26 @@
         }
         QCOMPARE(address.size(), 0);
     }
+
+    /*
+     * Test saving a contact with a multi line field
+     * BUG: #240587
+     */
+    void testFieldWithNewLineChar()
+    {
+        // create a contact
+        QContact contact = testContact();
+        QContactAddress addr;
+        addr.setCountry("Line1\nLine2\r\nLine3");
+        contact.saveDetail(&addr);
+        QSignalSpy spyContactAdded(m_manager, SIGNAL(contactsAdded(QList<QContactId>)));
+        bool result = m_manager->saveContact(&contact);
+        QCOMPARE(result, true);
+        QTRY_COMPARE(spyContactAdded.count(), 1);
+
+        addr = contact.detail<QContactAddress>();
+        QCOMPARE(addr.country(), QStringLiteral("Line1Line2Line3"));
+    }
 };
 
 QTEST_MAIN(QContactsTest)