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

[Renato Araujo Oliveira Filho]

Skip IM field if it was marked as folks automatic field.

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

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/address-book-service) on device or emulator? YES

* If you changed the UI, was the change specified/approved by design? N/A

* If you changed the packaging (debian), did you subscribe a core-dev to this MP? N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/49/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/58

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

doesn't work right
Steps to reproduce:
1) Add a contact with an email <email address hidden>
2) save the contact
3) edit the contct, add jabber <email address hidden>
4) save the contact
5) this all works, now try to delete the contact and you can't delete it

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/59

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

review: Approve (continuous-integration)

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

103. By Renato Araujo Oliveira Filho on 2014-02-24

Merged parent branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/66

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'common/vcard-parser.cpp'
--- common/vcard-parser.cpp	2013-11-05 19:26:25 +0000
+++ common/vcard-parser.cpp	2014-02-24 17:08:01 +0000
@@ -80,6 +80,22 @@
                 prop.setParameters(params);
             }
 
+            // export read-only info
+            if (detail.accessConstraints().testFlag(QContactDetail::ReadOnly)) {
+                QVersitProperty &prop = toBeAdded->last();
+                QMultiHash<QString, QString> params = prop.parameters();
+                params.insert(galera::VCardParser::ReadOnlyFieldName, "YES");
+                prop.setParameters(params);
+            }
+
+            // export Irremovable info
+            if (detail.accessConstraints().testFlag(QContactDetail::Irremovable)) {
+                QVersitProperty &prop = toBeAdded->last();
+                QMultiHash<QString, QString> params = prop.parameters();
+                params.insert(galera::VCardParser::IrremovableFieldName, "YES");
+                prop.setParameters(params);
+            }
+
             switch (detail.type()) {
                 case QContactDetail::TypeAvatar:
                 {
@@ -151,6 +167,23 @@
                 det.setDetailUri(pid);
             }
 
+            bool ro = (property.parameters().value(galera::VCardParser::ReadOnlyFieldName, "NO") == "YES");
+            bool irremovable = (property.parameters().value(galera::VCardParser::IrremovableFieldName, "NO") == "YES");
+            if (ro && irremovable) {
+                QContactDetail &det = updatedDetails->last();
+                QContactManagerEngine::setDetailAccessConstraints(&det,
+                                                                  QContactDetail::ReadOnly |
+                                                                  QContactDetail::Irremovable);
+            } else if (ro) {
+                QContactDetail &det = updatedDetails->last();
+                QContactManagerEngine::setDetailAccessConstraints(&det,
+                                                                  QContactDetail::ReadOnly);
+            } else if (irremovable) {
+                QContactDetail &det = updatedDetails->last();
+                QContactManagerEngine::setDetailAccessConstraints(&det,
+                                                                  QContactDetail::Irremovable);
+            }
+
             if (updatedDetails->size() == 0) {
                 return;
             }
@@ -204,6 +237,8 @@
 const QString VCardParser::PidMapFieldName = QStringLiteral("CLIENTPIDMAP");
 const QString VCardParser::PidFieldName = QStringLiteral("PID");
 const QString VCardParser::PrefParamName = QStringLiteral("PREF");
+const QString VCardParser::IrremovableFieldName = QStringLiteral("IRREMOVABLE");
+const QString VCardParser::ReadOnlyFieldName = QStringLiteral("READ-ONLY");
 
 static QMap<QtContacts::QContactDetail::DetailType, QString> prefferedActions()
 {

=== modified file 'common/vcard-parser.h'
--- common/vcard-parser.h	2013-07-21 01:09:23 +0000
+++ common/vcard-parser.h	2014-02-24 17:08:01 +0000
@@ -32,6 +32,8 @@
     static const QString PidMapFieldName;
     static const QString PidFieldName;
     static const QString PrefParamName;
+    static const QString IrremovableFieldName;
+    static const QString ReadOnlyFieldName;
     static const QMap<QtContacts::QContactDetail::DetailType, QString> PreferredActionNames;
 
     static QStringList contactToVcard(QList<QtContacts::QContact> contacts);

=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp	2014-02-24 17:08:01 +0000
+++ lib/qindividual.cpp	2014-02-24 17:08:01 +0000
@@ -187,9 +187,17 @@
 {
     if (!detail.isEmpty()) {
         QtContacts::QContactDetail cpy(detail);
-        if (readOnly) {
-            QContactManagerEngine::setDetailAccessConstraints(&cpy, QContactDetail::ReadOnly);
-        }
+        QtContacts::QContactDetail::AccessConstraints access;
+        if (readOnly ||
+            detail.accessConstraints().testFlag(QContactDetail::ReadOnly)) {
+            access |= QContactDetail::ReadOnly;
+        }
+
+        if (detail.accessConstraints().testFlag(QContactDetail::Irremovable)) {
+            access |= QContactDetail::Irremovable;
+        }
+
+        QContactManagerEngine::setDetailAccessConstraints(&cpy, access);
         contact->appendDetail(cpy);
     }
 }
@@ -589,6 +597,10 @@
         while(gee_iterator_next(iterValues)) {
             FolksAbstractFieldDetails *fd = FOLKS_ABSTRACT_FIELD_DETAILS(gee_iterator_get(iterValues));
             const char *uri = (const char*) folks_abstract_field_details_get_value(fd);
+            GeeCollection *parameters = folks_abstract_field_details_get_parameter_values(fd, "X-FOLKS-FIELD");
+            if (parameters) {
+                continue;
+            }
 
             QContactOnlineAccount account;
             account.setAccountUri(QString::fromUtf8(uri));

=== modified file 'qcontacts/contacts-service.cpp'
--- qcontacts/contacts-service.cpp	2013-10-23 13:31:03 +0000
+++ qcontacts/contacts-service.cpp	2014-02-24 17:08:01 +0000
@@ -59,7 +59,7 @@
       m_iface(0)
 {
     RequestData::registerMetaType();
- 
+
     m_serviceWatcher = new QDBusServiceWatcher(CPIM_SERVICE_NAME,
                                                QDBusConnection::sessionBus(),
                                                QDBusServiceWatcher::WatchForOwnerChange,

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2014-02-24 17:08:01 +0000
+++ tests/unittest/CMakeLists.txt	2014-02-24 17:08:01 +0000
@@ -70,8 +70,8 @@
 
     declare_test(addressbook-test True ${BASE_CLIENT_TEST_SRC})
     declare_test(service-life-cycle-test True ${BASE_CLIENT_TEST_SRC})
+    declare_test(readonly-prop-test True ${BASE_CLIENT_TEST_SRC})
     declare_test(contact-link-test True ${BASE_CLIENT_TEST_SRC})
-
 elseif()
     message(STATUS "DBus test runner not found. Some tests will be disabled")
 endif()

=== modified file 'tests/unittest/dummy-backend.cpp'
--- tests/unittest/dummy-backend.cpp	2014-02-24 17:08:01 +0000
+++ tests/unittest/dummy-backend.cpp	2014-02-24 17:08:01 +0000
@@ -213,15 +213,19 @@
 void DummyBackendProxy::configurePrimaryStore()
 {
     static const char* writableProperties[] = {
-        folks_persona_store_detail_key(FolksPersonaDetail::FOLKS_PERSONA_DETAIL_FULL_NAME),
-        folks_persona_store_detail_key(FolksPersonaDetail::FOLKS_PERSONA_DETAIL_EMAIL_ADDRESSES),
-        folks_persona_store_detail_key(FolksPersonaDetail::FOLKS_PERSONA_DETAIL_PHONE_NUMBERS),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_FULL_NAME),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_ALIAS),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_NICKNAME),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_STRUCTURED_NAME),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_IS_FAVOURITE),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_EMAIL_ADDRESSES),
+        folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_PHONE_NUMBERS),
         0
     };
 
     m_primaryPersonaStore = folks_dummy_persona_store_new("dummy-store",
                                                           "Dummy personas",
-                                                          const_cast<char**>(writableProperties), 4);
+                                                          const_cast<char**>(writableProperties), 7);
     folks_dummy_persona_store_set_persona_type(m_primaryPersonaStore, FOLKS_DUMMY_TYPE_FULL_PERSONA);
     folks_dummy_persona_store_update_trust_level(m_primaryPersonaStore, FOLKS_PERSONA_STORE_TRUST_FULL);
 

=== added file 'tests/unittest/readonly-prop-test.cpp'
--- tests/unittest/readonly-prop-test.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittest/readonly-prop-test.cpp	2014-02-24 17:08:01 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "base-client-test.h"
+#include "lib/source.h"
+#include "common/dbus-service-defs.h"
+#include "common/vcard-parser.h"
+
+#include <QObject>
+#include <QtDBus>
+#include <QtTest>
+#include <QDebug>
+#include <QtVersit>
+
+class ReadOnlyPropTest : public BaseClientTest
+{
+    Q_OBJECT
+private:
+    QString m_basicVcard;
+    QString m_resultBasicVcard;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        BaseClientTest::initTestCase();
+        m_basicVcard = QStringLiteral("BEGIN:VCARD\n"
+                                      "VERSION:3.0\n"
+                                      "N:Tal;Fulano_;de;;\n"
+                                      "EMAIL:[e-mail]\n"
+                                      "TEL;PID=1.1;TYPE=ISDN:33331410\n"
+                                      "TEL;PID=1.2;TYPE=CELL:8888888\n"
+                                      "URL:www.canonical.com\n"
+                                      "END:VCARD");
+    }
+
+    void testCreateContactAndReturnReadOlyFileds()
+    {
+        // call create contact
+        QDBusReply<QString> reply = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
+
+        // check if the returned id is valid
+        QString newContactId = reply.value();
+        QVERIFY(!newContactId.isEmpty());
+
+        // check if the cotact was created with URL as read-only field
+        // URL is not a writable property on our dummy backend
+        QDBusReply<QStringList> reply2 = m_dummyIface->call("listContacts");
+        QCOMPARE(reply2.value().count(), 1);
+
+        QList<QtContacts::QContact> contactsCreated = galera::VCardParser::vcardToContact(reply2.value());
+        QCOMPARE(contactsCreated.count(), 1);
+        Q_FOREACH(QContactDetail det, contactsCreated[0].details()) {
+            if (det.type() == QContactDetail::TypeUrl) {
+                QVERIFY(det.accessConstraints().testFlag(QContactDetail::ReadOnly));
+            } else {
+                QVERIFY(!det.accessConstraints().testFlag(QContactDetail::ReadOnly));
+            }
+        }
+    }
+};
+
+QTEST_MAIN(ReadOnlyPropTest)
+
+#include "readonly-prop-test.moc"