Merge lp:~renatofilho/address-book-service/fix-vcard-import into lp:address-book-service

[Renato Araujo Oliveira Filho]

Fix importing vcards that contains address with multiple types.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/418/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4351
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23654

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/418/rebuild

review: Approve (continuous-integration)

[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 CHANGED

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

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

[lp:~renatofilho/address-book-service/fix-vcard-import]

164. By Renato Araujo Oliveira Filho on 2015-10-27

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/459/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3915
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4860
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24622

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/459/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Added a couple of diff comments

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

Thanks for clarifying, looks good.

review: Approve

=== modified file 'lib/detail-context-parser.cpp'
--- lib/detail-context-parser.cpp	2014-07-08 19:24:25 +0000
+++ lib/detail-context-parser.cpp	2015-10-27 15:15:49 +0000
@@ -75,6 +75,10 @@
             break;
         case QContactDetail::TypeAddress:
             context << parseAddressContext(detail);
+            // Setting more than one context causes folks to freeze
+            if (!context.isEmpty()) {
+                return context.mid(0,1);
+            }
             break;
         case QContactDetail::TypeOnlineAccount:
             context << parseOnlineAccountContext(detail);

=== modified file 'tests/unittest/qcontacts-test.cpp'
--- tests/unittest/qcontacts-test.cpp	2015-09-24 17:47:49 +0000
+++ tests/unittest/qcontacts-test.cpp	2015-10-27 15:15:49 +0000
@@ -574,6 +574,21 @@
         QCOMPARE(updatedName.lastName(), name.lastName());
     }
 
+    void testAddressWithMultipleSubTypes()
+    {
+        // create a contact
+        QContact contact = testContact();
+        QContactAddress addr;
+        addr.setLocality("8777 West Six Mile Road");
+        addr.setContexts(QList<int>() << QContactDetail::ContextWork);
+        addr.setSubTypes(QList<int>() << QContactAddress::SubTypeParcel << QContactAddress::SubTypeDomestic);
+        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);
+    }
 };
 
 QTEST_MAIN(QContactsTest)