Merge lp:~renatofilho/address-book-app/fix-1226378 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Implemented new app uri support.

Add a phone number to a existing contact.
addressbook://addphone?id=<contactid>&phone=<phone>

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/151
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/151/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3563
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/3010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1081
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1081/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/909

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2013-08-01 19:58:35 +0000
+++ src/app/addressbookapp.cpp	2013-09-17 22:21:49 +0000
@@ -20,6 +20,7 @@
 
 #include <QDir>
 #include <QUrl>
+#include <QUrlQuery>
 #include <QDebug>
 #include <QStringList>
 #include <QQuickItem>
@@ -39,6 +40,9 @@
              << arguments.at(0).toUtf8().constData()
              << "[contact://CONTACT_ID]"
              << "[create://PHONE_NUMBER]"
+             << "[addressbook://addphone?id=<contact-id>&phone=<phone-number>"
+             << "[addressbook://contact?id=<contact-id>"
+             << "[addressbook://create?phone=<phone-number>"
              << "[--fullscreen]"
              << "[--help]"
              << "[-testability]";
@@ -81,6 +85,7 @@
     if (validSchemes.isEmpty()) {
         validSchemes << "contact";
         validSchemes << "create";
+        validSchemes << "addressbook";
     }
 
     QString contactKey;
@@ -197,32 +202,124 @@
     }
 }
 
+void AddressBookApp::parseUrl(const QString &arg)
+{
+    QUrl url(arg);
+
+    QString methodName = url.host();
+    QStringList args;
+
+    QMap<QString, QStringList> methodsMetaData;
+
+    if (methodsMetaData.isEmpty()) {
+        QStringList args;
+        //edit
+        args << "id" << "phone";
+        methodsMetaData.insert("addphone", args);
+        args.clear();
+
+        //view
+        args << "id";
+        methodsMetaData.insert("contact", args);
+        args.clear();
+
+        //add
+        args << "phone";
+        methodsMetaData.insert("create", args);
+        args.clear();
+    }
+
+    QUrlQuery query(url);
+    QList<QPair<QString, QString> > queryItemsPair = query.queryItems();
+    QMap<QString, QString> queryItems;
+
+    //convert items to map
+    for(int i=0; i < queryItemsPair.count(); i++) {
+        QPair<QString, QString> item = queryItemsPair[i];
+        queryItems.insert(item.first, item.second);
+    }
+
+    if (methodsMetaData.contains(methodName)) {
+        QStringList argsNames = methodsMetaData[methodName];
+
+        if (queryItems.size() != argsNames.size()) {
+            qWarning() << "invalid" << methodName << "arguments size";
+            return;
+        }
+
+        Q_FOREACH(QString arg, argsNames) {
+            if (queryItems.contains(arg)) {
+                args << queryItems[arg];
+            } else {
+                qWarning() << "argument" << arg << "not found in method" << methodName << "call";
+                return;
+            }
+        }
+    } else {
+        qWarning() << "method" << methodName << "not supported";
+        return;
+    }
+
+    callQMLMethod(methodName, args);
+}
+
 void AddressBookApp::parseArgument(const QString &arg)
 {
     if (arg.isEmpty()) {
         return;
     }
 
+    // new scheme
+    if (arg.startsWith("addressbook://")) {
+        parseUrl(arg);
+        return;
+    }
+
     QStringList args = arg.split("://");
     if (args.size() != 2) {
         return;
     }
 
     QString scheme = args[0];
-    QString value = args[1];
-
+    QStringList values;
+    values << args[1];
+
+    callQMLMethod(scheme, values);
+}
+
+void AddressBookApp::callQMLMethod(const QString name, QStringList args)
+{
     QQuickItem *mainView = m_view->rootObject();
     if (!mainView) {
         return;
     }
     const QMetaObject *mo = mainView->metaObject();
 
+    // create QML signature: Ex. function(QVariant, QVariant, QVariant)
+    QString argsSignature = QString("QVariant,").repeated(args.size());
+    if (argsSignature.endsWith(",")) {
+        argsSignature = argsSignature.left(argsSignature.size() - 1);
+    }
 
-    QString methodSignature = QString("%1(%2)").arg(scheme).arg(scheme.isEmpty() ? "" : "QVariant");
+    QString methodSignature = QString("%1(%2)").arg(name).arg(argsSignature);
     int index = mo->indexOfMethod(methodSignature.toUtf8().data());
     if (index != -1) {
         QMetaMethod method = mo->method(index);
-        method.invoke(mainView, Q_ARG(QVariant, QVariant(value)));
+        switch(args.count()) {
+        case 0:
+            method.invoke(mainView);
+            break;
+        case 1:
+            method.invoke(mainView, Q_ARG(QVariant, QVariant(args[0])));
+            break;
+        case 2:
+            method.invoke(mainView, Q_ARG(QVariant, QVariant(args[0])),
+                                    Q_ARG(QVariant, QVariant(args[1])));
+            break;
+        default:
+            qWarning() << "Invalid arguments";
+            break;
+        }
     }
 }
 

=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2013-07-31 22:24:45 +0000
+++ src/app/addressbookapp.h	2013-09-17 22:21:49 +0000
@@ -38,6 +38,8 @@
 
 private:
     void parseArgument(const QString &arg);
+    void parseUrl(const QString &arg);
+    void callQMLMethod(const QString name, QStringList args);
 
 private Q_SLOTS:
     void onMessageReceived(const QString &message);

=== modified file 'src/app/addressbookappdbus.cpp'
--- src/app/addressbookappdbus.cpp	2013-08-01 19:58:35 +0000
+++ src/app/addressbookappdbus.cpp	2013-09-17 22:21:49 +0000
@@ -71,3 +71,9 @@
     qDebug() << "DBUS CALLL" << message;
     Q_EMIT request(message);
 }
+
+void AddressBookAppDBus::AddPhoneToContact(const QString &contactId, const QString &phoneNumber)
+{
+    Q_EMIT request(QString("addressbook://edit?%1&%2").arg(contactId).arg(phoneNumber));
+}
+

=== modified file 'src/app/addressbookappdbus.h'
--- src/app/addressbookappdbus.h	2013-08-01 19:58:35 +0000
+++ src/app/addressbookappdbus.h	2013-09-17 22:21:49 +0000
@@ -41,6 +41,7 @@
     Q_NOREPLY void ShowContact(const QVariant &contactId);
     Q_NOREPLY void CreateContact(const QString &phoneNumber);
     Q_NOREPLY void SendAppMessage(const QString &message);
+    Q_NOREPLY void AddPhoneToContact(const QString &contactId, const QString &phoneNumber);
 
 Q_SIGNALS:
     void request(const QString &message);

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2013-08-02 17:40:44 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2013-09-17 22:21:49 +0000
@@ -8,6 +8,7 @@
     ContactDetailPhoneNumbersEditor.qml
     ContactDetailWithTypeEditor.qml
     ContactEditor.qml
+    ContactFetchError.qml
     EditToolbar.qml
     TextInputDetail.qml
     ValueSelector.qml

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-09-12 23:22:06 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-09-17 22:21:49 +0000
@@ -18,6 +18,7 @@
 import QtContacts 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
 
 Page {
     id: contactEditor
@@ -25,6 +26,11 @@
     property QtObject contact: null
     property QtObject model: null
 
+    // this is used to add a phone number to a existing contact
+    property int currentFetchOperation: -1
+    property string contactId: null
+    property string newPhoneNumber: null
+
     property QtObject activeItem: null
 
     // we use a custom toolbar in this view
@@ -93,6 +99,57 @@
         scrollArea.returnToBounds()
     }
 
+    ContactFetchError {
+        id: fetchErrorDialog
+    }
+
+    Connections {
+        target: model
+        onContactsFetched: {
+            if (requestId == currentFetchOperation) {
+                currentFetchOperation = -1
+                // this fetch request can only return one contact
+                if(fetchedContacts.length !== 1) {
+                    PopupUtils.open(fetchErrorDialog, null)
+                }
+                contact = fetchedContacts[0]
+            }
+        }
+    }
+
+    onContactIdChanged:  {
+        if (contactId) {
+            currentFetchOperation = model.fetchContacts(contactId)
+        }
+    }
+
+    onContactChanged: {
+        if (contact && (newPhoneNumber.length > 0)) {
+            var detailSourceTemplate = "import QtContacts 5.0; PhoneNumber{ number: \"" + newPhoneNumber + "\" }"
+            var newDetail = Qt.createQmlObject(detailSourceTemplate, contactEditor)
+            if (newDetail) {
+                contact.addDetail(newDetail)
+                // we need to wait for the field be created
+                focusTimer.restart()
+
+            }
+            newPhoneNumber = ""
+
+        }
+    }
+
+    Timer {
+        id: focusTimer
+
+        interval: 200
+        running: false
+        onTriggered: {
+            // get last phone field and set focus
+            var lastPhoneField = phones.detailDelegates[phones.detailDelegates.length - 2].item
+            lastPhoneField.forceActiveFocus()
+        }
+    }
+
     flickable: null
     Flickable {
         id: scrollArea
@@ -143,6 +200,8 @@
             }
 
             ContactDetailPhoneNumbersEditor {
+                id: phones
+
                 contact: contactEditor.contact
                 anchors {
                     left: parent.left

=== added file 'src/imports/ContactEdit/ContactFetchError.qml'
--- src/imports/ContactEdit/ContactFetchError.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/ContactFetchError.qml	2013-09-17 22:21:49 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Component {
+    Dialog {
+        id: dialogue
+
+        title: i18n.tr("Error")
+        text: i18n.tr("Contact not found")
+
+        Button {
+            text: "Cancel"
+            gradient: UbuntuColors.greyGradient
+            onClicked: {
+                PopupUtils.close(dialogue)
+                pageStack.pop()
+            }
+        }
+    }
+}

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2013-08-29 20:13:18 +0000
+++ src/imports/ContactList/ContactListPage.qml	2013-09-17 22:21:49 +0000
@@ -134,5 +134,9 @@
             pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
                            {model: contactList.listModel, contact: newContact})
         }
+        onEditContatRequested: {
+            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                           {model: contactList.listModel, contactId: contactId, newPhoneNumber: phoneNumber })
+        }
     }
 }

=== modified file 'src/imports/main.qml'
--- src/imports/main.qml	2013-09-09 21:38:01 +0000
+++ src/imports/main.qml	2013-09-17 22:21:49 +0000
@@ -35,11 +35,19 @@
         mainStack.createContactRequested(phoneNumber)
     }
 
+    function addphone(contactId, phoneNumber) {
+        mainStack.newPhoneNumber = phoneNumber
+        mainStack.editContatRequested(contactId, phoneNumber)
+    }
+
     PageStack {
         id: mainStack
 
+        property string newPhoneNumber: ""
+
         signal contactRequested(string contactId)
         signal createContactRequested(string phoneNumber)
+        signal editContatRequested(string contactId, string phoneNumber)
 
         anchors {
             fill: parent