Merge lp:~renatofilho/address-book-app/multiple-addressbook into lp:address-book-app

[Renato Araujo Oliveira Filho]

Implemented support to create contacts in different sources.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/446/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3691
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3285/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3696
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3287/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5657/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4503

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/multiple-addressbook]

144. By Renato Araujo Oliveira Filho on 2014-03-19

Merged: lp:~renatofilho/address-book-app/optimize-app

145. By Renato Araujo Oliveira Filho on 2014-03-20

Merged parent branch.

146. By Renato Araujo Oliveira Filho on 2014-03-20

Merged parent branch.

147. By Renato Araujo Oliveira Filho on 2014-03-21

Added missing file.

148. By Renato Araujo Oliveira Filho on 2014-03-21

Fixed problem saving contact without sync target.

149. By Renato Araujo Oliveira Filho on 2014-03-25

Merged parent branch.

150. By Renato Araujo Oliveira Filho on 2014-03-25

Set the default icon for address-book.

151. By Renato Araujo Oliveira Filho on 2014-03-26

Merged parent branch: lp:~renatofilho/address-book-app/optimize-app

152. By Renato Araujo Oliveira Filho on 2014-03-26

Merged mainline.

153. By Renato Araujo Oliveira Filho on 2014-03-26

Fixed scroll to created contact.

154. By Renato Araujo Oliveira Filho on 2014-03-26

Scroll to contact based on the contact name if the contact id is empty

Unmerged revisions

=== modified file 'src/imports/Common/ContactDetailBase.qml'
--- src/imports/Common/ContactDetailBase.qml	2013-11-14 13:25:28 +0000
+++ src/imports/Common/ContactDetailBase.qml	2014-03-19 18:42:11 +0000
@@ -61,6 +61,10 @@
         imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
         imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
 
+        // SyncTarget
+        var syncTargetMap = {}
+        syncTargetMap[QtContacts.SyncTarget.SyncTarget] = "syncTarget"
+
         // all
         var detailMap = {}
         detailMap[QtContacts.ContactDetail.Name] = nameMap
@@ -68,6 +72,7 @@
         detailMap[QtContacts.ContactDetail.Email] = emailMap
         detailMap[QtContacts.ContactDetail.Address] = addressMap
         detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
+        detailMap[QtContacts.ContactDetail.SyncTarget] = syncTargetMap
 
         // detail name
         var detailNameMap = {}
@@ -76,6 +81,7 @@
         detailNameMap[QtContacts.ContactDetail.Email] = "email"
         detailNameMap[QtContacts.ContactDetail.Address] = "address"
         detailNameMap[QtContacts.ContactDetail.OnlineAccount] = "onlineAccount"
+        detailNameMap[QtContacts.ContactDetail.SyncTarget] = "syncTarget"
 
         if ((detail in detailMap) && (field in detailMap[detail])) {
             return detailMap[detail][field]

=== modified file 'src/imports/Common/ContactDetailGroupBase.qml'
--- src/imports/Common/ContactDetailGroupBase.qml	2014-01-14 20:43:59 +0000
+++ src/imports/Common/ContactDetailGroupBase.qml	2014-03-19 18:42:11 +0000
@@ -21,7 +21,7 @@
 FocusScope {
     id: root
 
-    readonly property variant details: contact && contact.contactDetails && detailType ? contact.details(detailType) : []
+    property var details: []
     readonly property alias detailDelegates: contents.children
     readonly property int detailsCount: detailsModel.count
 
@@ -38,7 +38,27 @@
 
     signal newFieldAdded(var index)
 
-    implicitHeight: detailsModel.values.length > 0 ? contents.implicitHeight : minimumHeight
+    function reloadDetails(clearFields)
+    {
+        if (clearFields) {
+            root.inputFields = []
+        }
+
+        if (contact && detailType) {
+            root.details = contact.details(detailType)
+        } else {
+            root.details = []
+        }
+    }
+
+    onContactChanged: reloadDetails(true)
+    onDetailTypeChanged: reloadDetails(true)
+    Connections {
+        target: root.contact
+        onContactChanged: reloadDetails(false)
+    }
+
+    implicitHeight: detailsCount > 0 ? contents.implicitHeight : minimumHeight
     visible: implicitHeight > 0
 
     // This model is used to avoid rebuild the repeater every time that the details change
@@ -46,7 +66,7 @@
     ListModel {
         id: detailsModel
 
-        property var values: root.showEmpty ? root.details : filterDetails(root.details)
+        property var values: root.showEmpty && root.details ? root.details : filterDetails(root.details)
 
         function filterDetails(details) {
             var result = []
@@ -68,6 +88,7 @@
 
         onValuesChanged: {
             if (!values) {
+                root.inputFields = []
                 clear()
                 return
             }
@@ -78,7 +99,7 @@
 
             var modelCount = count
             for(var i=0; i < values.length; i++) {
-                if (modelCount < i) {
+                if (modelCount <= i) {
                     append({"detail": values[i]})
                 } else if (get(i) != values[i]) {
                     set(i, {"detail": values[i]})
@@ -112,7 +133,7 @@
                 Binding {
                     target: detailItem.item
                     property: "detail"
-                    value: root.contact && root.details ? root.details[index] : null
+                    value: model.detail
                 }
 
                 Binding {

=== modified file 'src/imports/Common/ContactDetailGroupWithTypeBase.qml'
--- src/imports/Common/ContactDetailGroupWithTypeBase.qml	2014-01-14 20:43:59 +0000
+++ src/imports/Common/ContactDetailGroupWithTypeBase.qml	2014-03-19 18:42:11 +0000
@@ -23,6 +23,7 @@
 
     property string defaultIcon : "artwork:/protocol-other.png"
     property ListModel typeModel
+    property bool typeModelReady: false
 
     function getType(detail) {
         if (typeModel) {
@@ -40,7 +41,6 @@
     }
 
     typeModel: ListModel {
-        property bool ready: false
         signal loaded()
 
         function getTypeIndex(detail) {
@@ -116,8 +116,12 @@
             append({"value": QtContacts.ContactDetail.ContextHome, "label": i18n.tr("Home"), "icon": null})
             append({"value": QtContacts.ContactDetail.ContextWork, "label": i18n.tr("Work"), "icon": null})
             append({"value": QtContacts.ContactDetail.ContextOther, "label": i18n.tr("Other"), "icon": null})
-            ready = true
             loaded()
         }
     }
+    onTypeModelChanged: root.typeModelReady = false
+    Connections {
+        target: root.typeModel
+        onLoaded: root.typeModelReady = true
+    }
 }

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2013-09-24 15:07:46 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2014-03-19 18:42:11 +0000
@@ -7,6 +7,7 @@
     ContactDetailOnlineAccountsEditor.qml
     ContactDetailOrganizationsEditor.qml
     ContactDetailPhoneNumbersEditor.qml
+    ContactDetailSyncTargetEditor.qml
     ContactDetailWithTypeEditor.qml
     ContactEditor.qml
     ContactFetchError.qml

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2013-10-15 14:34:03 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-03-19 18:42:11 +0000
@@ -27,6 +27,10 @@
 
     readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png")
 
+    function isEmpty() {
+        return false;
+    }
+
     function save() {
         if (avatarImage.source != root.defaultAvatar) {
             if (root.detail && (root.detail === avatarImage.source)) {

=== modified file 'src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-02-19 12:06:20 +0000
+++ src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-03-19 18:42:11 +0000
@@ -40,6 +40,7 @@
 
     function save() {
         var changed = false
+        var removedDetails = []
         for(var i=0; i < detailDelegates.length; i++) {
             var delegate = detailDelegates[i]
 
@@ -49,17 +50,30 @@
             }
 
             if (delegate.save) {
-                // save type
-                if (updateDetail(delegate.detail, delegate.selectedTypeIndex)) {
-                    changed = true
-                }
-
-                // save fields
-                if (delegate.save()) {
-                    changed = true
-                }
-            }
-        }
+                // check if was removed
+                if (delegate.isEmpty()) {
+                    removedDetails.push(delegate.detail)
+                    changed = true
+                } else {
+                    if (updateDetail(delegate.detail, delegate.selectedTypeIndex)) {
+                        changed = true
+                    }
+
+                    // save field changes
+                    if (delegate.save()) {
+                        changed = true
+                    }
+                }
+            }
+        }
+
+        for(var i=0; i < removedDetails.length; i++) {
+            if (contact.isPreferredDetail("TEL", removedDetails[i])) {
+                contact.favorite.favorite = false
+            }
+            contact.removeDetail(removedDetails[i])
+        }
+
         return changed
     }
 
@@ -146,7 +160,6 @@
                 }
             }
         }
-
         placeholderTexts: root.placeholderTexts
         contact: root.contact
         fields: root.fields
@@ -161,7 +174,7 @@
         Item {
             Connections {
                 target: root.typeModel
-                onReadyChanged: updateCombo(true)
+                onLoaded: updateCombo(true)
             }
         }
     }

=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-01-23 01:09:04 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-03-19 18:42:11 +0000
@@ -26,6 +26,10 @@
     property bool isEmpty: (fields == -1) || (emptyFields.length === fields.length)
     property variant emptyFields: []
 
+    function isEmpty() {
+        return false
+    }
+
     function save() {
         var changed = false;
 

=== added file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-03-19 18:42:11 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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 QtContacts 5.0
+
+import "../Common"
+
+ContactDetailBase {
+    id: root
+
+    function save() {
+        // only changes the target sync for new contacts
+        if (!isNewContact) {
+            return;
+        }
+
+        var activeSource = getSelectedSource()
+        if (!root.detail) {
+            root.detail = root.contact.syncTarget
+        }
+        root.detail.syncTarget = activeSource
+    }
+
+    function getSelectedSource() {
+        return sourceModel.contacts[sources.selectedIndex].guid.guid
+    }
+
+    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
+
+    detail: contact ? contact.detail(ContactDetail.SyncTarget) : null
+    implicitHeight: isNewContact ? units.gu(5) : 0
+
+    ContactModel {
+        id: sourceModel
+
+        manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
+        filter:  DetailFilter {
+            detail: ContactDetail.Type
+            field: Type.TypeField
+            value: Type.Group
+            matchFlags: DetailFilter.MatchExactly
+        }
+    }
+
+    OptionSelector {
+        id: sources
+
+        anchors.fill: parent
+        model: sourceModel
+        delegate: OptionSelectorDelegate {
+            text: contact.displayLabel.label
+        }
+
+        containerHeight: itemHeight * 4
+    }
+    z: 1000
+}
+

=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-01-28 14:28:58 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-03-19 18:42:11 +0000
@@ -36,33 +36,32 @@
         detailTypeSelector.selectItem(type)
     }
 
+    function isEmpty() {
+        for (var i=0; i < fieldValues.children.length; i++) {
+            var input = fieldValues.children[i]
+            if (input.text && (input.text !== "")) {
+                return false
+            }
+        }
+        return true
+    }
+
     function save() {
         var detailchanged  = false
 
         // save field values
-        var isEmpty = true
         for (var i=0; i < fieldValues.children.length; i++) {
             var input = fieldValues.children[i]
             if (input.detail && (input.field >= 0)) {
-                var originalValue = input.detail.value(input.field)
-                originalValue = originalValue ? String(originalValue) : ""
                 if (input.text !== "") {
-                    isEmpty = false
-                }
-
-                if (originalValue !== input.text) {
-                    input.detail.setValue(input.field, input.text)
-                    detailchanged  = true
-                }
-            }
-        }
-
-        if (isEmpty) {
-            // unfavorite the contact if the favorite number was removed
-            if (contact.isPreferredDetail("TEL", detail)) {
-                contact.favorite.favorite = false
-            }
-            contact.removeDetail(input.detail)
+                    var originalValue = input.detail.value(input.field)
+                    originalValue = originalValue ? String(originalValue) : ""
+                    if (originalValue !== input.text) {
+                        root.detail.setValue(input.field, input.text)
+                        detailchanged  = true
+                    }
+                }
+            }
         }
 
         return detailchanged

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-11-21 12:14:04 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-03-19 18:42:11 +0000
@@ -19,16 +19,16 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.Contacts 0.1 as ContactsUI
 
 Page {
     id: contactEditor
     objectName: "contactEditorPage"
 
     property QtObject contact: null
-    property QtObject model: null
+    property alias model: contactFetch.model
 
     // this is used to add a phone number to a existing contact
-    property int currentFetchOperation: -1
     property string contactId: ""
     property string newPhoneNumber: ""
 
@@ -78,10 +78,10 @@
         }
 
         if (changed) {
-            model.saveContact(contact)
-        } else {
-            pageStack.pop()
+            // backend error will be handled by the root page (contact list)
+            contactEditor.model.saveContact(contact)
         }
+        pageStack.pop()
     }
 
     function makeMeVisible(item) {
@@ -114,39 +114,10 @@
         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 = ""
-
-        }
+    ContactsUI.ContactFetch {
+        id: contactFetch
+
+        onContactNotFound: PopupUtils.open(fetchErrorDialog, null)
     }
 
     Timer {
@@ -176,7 +147,6 @@
         }
         contentHeight: contents.height
         contentWidth: parent.width
-        visible: !busyIndicator.visible
 
         // after add a new field we need to wait for the contentHeight to change to scroll to the correct position
         onContentHeightChanged: contactEditor.makeMeVisible(contactEditor.activeItem)
@@ -192,6 +162,18 @@
             }
             height: childrenRect.height
 
+            ContactDetailSyncTargetEditor {
+                id: syncTargetEditor
+
+                contact: contactEditor.contact
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: implicitHeight
+                KeyNavigation.tab: nameEditor
+            }
+
             ContactDetailNameEditor {
                 id: nameEditor
 
@@ -202,6 +184,7 @@
                 }
                 height: implicitHeight + units.gu(3)
                 KeyNavigation.tab: avatarEditor
+                KeyNavigation.backtab : syncTargetEditor
             }
 
             ContactDetailAvatarEditor {
@@ -286,46 +269,6 @@
         }
     }
 
-    Component.onCompleted: nameEditor.forceActiveFocus()
-
-    ActivityIndicator {
-        id: busyIndicator
-
-        running: contactSaveLock.saving
-        visible: running
-        anchors.centerIn: parent
-    }
-
-    Connections {
-        id: contactSaveLock
-
-        property bool saving: false
-
-        target: contactEditor.model
-
-        onContactsChanged: {
-            if (saving) {
-                saving = false
-                pageStack.contactCreated(contactEditor.contact)
-                pageStack.pop()
-            } else if (contactEditor.contact &&
-                       (contactEditor.contact.contactId != "qtcontacts:::")) {
-                for (var i=0; i < contactEditor.model.contacts.length; i++) {
-                    if (contactEditor.model.contacts[i].contactId == contactEditor.contact.contactId) {
-                        return
-                    }
-                }
-                contactEditor.contact = null
-                pageStack.pop()
-            }
-        }
-
-        onErrorChanged: {
-            //TODO: show a dialog
-            console.debug("Save error:" + contactEditor.model.error)
-        }
-    }
-
     EditToolbar {
         id: toolbar
         anchors {
@@ -337,11 +280,7 @@
         acceptAction: Action {
             text: i18n.tr("Save")
             enabled: !nameEditor.isEmpty
-            onTriggered: {
-                // wait for contact to be saved or cause a error
-                contactSaveLock.saving = true
-                contactEditor.save()
-            }
+            onTriggered: contactEditor.save()
         }
         rejectAction: Action {
             text: i18n.tr("Cancel")
@@ -358,4 +297,26 @@
             }
         }
     }
+
+    // This will load the contact information and add the new phone number
+    // when the app was launched with the URI: addressbook:///addphone?id=<contact-id>&phone=<phone-number>
+    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 = ""
+        }
+    }
+
+    Component.onCompleted: {
+        if (contactId !== "") {
+            contactFetch.fetchContact(contactId)
+        }
+        nameEditor.forceActiveFocus()
+    }
 }

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-02-25 20:20:21 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-03-19 18:42:11 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Popups 0.1 as Popups
 import Ubuntu.Contacts 0.1 as ContactsUI
 import QtContacts 5.0
 
@@ -48,25 +47,7 @@
         return newContact
     }
 
-
-
     title: i18n.tr("Contacts")
-    Component {
-        id: dialog
-
-        Popups.Dialog {
-            id: dialogue
-
-            title: i18n.tr("Error")
-            text: i18n.tr("Fail to Load contacts")
-
-            Button {
-                text: "Cancel"
-                gradient: UbuntuColors.greyGradient
-                onClicked: PopupUtils.close(dialogue)
-            }
-        }
-    }
 
     ContactsUI.ContactListView {
         id: contactList
@@ -83,7 +64,6 @@
             bottomMargin: contactList.isInSelectionMode ? 0 : units.gu(2)
             fill: parent
         }
-        onError: PopupUtils.open(dialog, null)
         swipeToDelete: !pickMode
 
         ActivityIndicator {
@@ -96,7 +76,8 @@
 
         onContactClicked: {
             pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
-                           {model: contactList.listModel, contactId: contact.contactId})
+                           {model: contactList.listModel,
+                            contact: contact})
         }
 
         onSelectionDone: {
@@ -116,6 +97,7 @@
                 contactList.listModel.removeContacts(ids)
             }
         }
+
         onSelectionCanceled: {
             if (pickMode) {
                 if (contactContentHub) {
@@ -131,6 +113,8 @@
                 toolbar.opened = false
             }
         }
+
+        onError: pageStack.contactModelError(error)
     }
 
     tools: ToolbarItems {

=== modified file 'src/imports/ContactView/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2013-10-08 18:42:21 +0000
+++ src/imports/ContactView/ContactDetailAvatarView.qml	2014-03-19 18:42:11 +0000
@@ -23,10 +23,12 @@
 ContactDetailBase {
     id: root
 
+    readonly property string defaultAvatar: Qt.resolvedUrl("../../artwork/contact-default-profile.png")
+
     function getAvatar(avatarDetail)
     {
         // use this verbose mode to avoid problems with binding loops
-        var avatarUrl = Qt.resolvedUrl("../../artwork/contact-default-profile.png")
+        var avatarUrl = defaultAvatar
         if (avatarDetail) {
             var avatarValue = avatarDetail.value(Avatar.ImageUrl)
             if (avatarValue != "") {
@@ -41,7 +43,8 @@
 
     Image {
         anchors.fill: parent
-        source: root.getAvatar(root.detail)
+        // make sure that the avatar changes if the contact changes
+        source: root.contact ? root.getAvatar(root.detail) : root.defaultAvatar
         asynchronous: true
         smooth: true
         fillMode: Image.PreserveAspectCrop

=== modified file 'src/imports/ContactView/ContactDetailGroupWithTypeView.qml'
--- src/imports/ContactView/ContactDetailGroupWithTypeView.qml	2014-01-14 20:43:59 +0000
+++ src/imports/ContactView/ContactDetailGroupWithTypeView.qml	2014-03-19 18:42:11 +0000
@@ -51,7 +51,7 @@
     }
 
     detailDelegate: ContactDetailWithTypeView {
-        property variant detailType: detail && root.contact && root.typeModel.ready ? root.getType(detail) : null
+        property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : ""
 
         action: root.defaultAction
         contact: root.contact

=== modified file 'src/imports/ContactView/ContactDetailPhoneNumberView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumberView.qml	2013-11-14 13:25:28 +0000
+++ src/imports/ContactView/ContactDetailPhoneNumberView.qml	2014-03-19 18:42:11 +0000
@@ -25,10 +25,11 @@
 
     property alias typeLabel: view.typeLabel
     property alias lineHeight: view.lineHeight
+    readonly property bool isReady: (fields != null) && (detail != null)
 
     function populateValues()
     {
-        if (fields && detail) {
+        if (isReady) {
             var values = []
             for(var i=0; i < fields.length; i++) {
                 values.push(detail.value(fields[i]))
@@ -38,8 +39,11 @@
     }
 
     implicitHeight: view.implicitHeight
-    onFieldsChanged: populateValues()
-    onDetailChanged: populateValues()
+    onIsReadyChanged: populateValues()
+    Connections {
+        target: root.detail
+        onDetailChanged: populateValues()
+    }
 
     BasicFieldView {
         id: view

=== modified file 'src/imports/ContactView/ContactDetailPhoneNumbersView.qml'
--- src/imports/ContactView/ContactDetailPhoneNumbersView.qml	2014-02-25 21:52:58 +0000
+++ src/imports/ContactView/ContactDetailPhoneNumbersView.qml	2014-03-19 18:42:11 +0000
@@ -35,7 +35,7 @@
     }
 
     detailDelegate: ContactDetailPhoneNumberView {
-        property variant detailType: detail && root.contact && root.typeModel.ready ? root.getType(detail) : null
+        property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : null
 
         contact: root.contact
         fields: root.fields

=== modified file 'src/imports/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/ContactView/ContactDetailWithTypeView.qml	2013-11-14 17:48:48 +0000
+++ src/imports/ContactView/ContactDetailWithTypeView.qml	2014-03-19 18:42:11 +0000
@@ -27,10 +27,11 @@
     property alias typeLabel: view.typeLabel
     property string typeIcon: null
     property alias lineHeight: view.lineHeight
+    readonly property bool isReady: (fields != null) && (detail != null)
 
     function populateValues()
     {
-        if (fields && detail) {
+        if (isReady) {
             var values = []
             for(var i=0; i < fields.length; i++) {
                 values.push(detail.value(fields[i]))
@@ -39,9 +40,12 @@
         }
     }
 
-    onFieldsChanged: populateValues()
-    onDetailChanged: populateValues()
     implicitHeight: view.implicitHeight
+    onIsReadyChanged: populateValues()
+    Connections {
+        target: root.detail
+        onDetailChanged: populateValues()
+    }
 
     BasicFieldView {
         id: view

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-02-25 21:52:58 +0000
+++ src/imports/ContactView/ContactView.qml	2014-03-19 18:42:11 +0000
@@ -24,15 +24,15 @@
     id: root
     objectName: "contactViewPage"
 
-    readonly property alias contact: contactFetch.contact
-    property variant contactId: null
+    property QtObject contact: null
     property alias model: contactFetch.model
+    // used by main page to open the contact view on app startup
+    property string contactId: ""
 
     function formatNameToDisplay(contact) {
         if (!contact) {
             return ""
         }
-
         if (contact.name) {
             var detail = contact.name
             return detail.firstName +" " + detail.lastName
@@ -43,14 +43,10 @@
         }
     }
 
-
     title: formatNameToDisplay(contact)
     onActiveChanged: {
         if (active) {
-            contactFetch.fetchContact(root.contactId)
-
             //WORKAROUND: to correct scroll back the page
-            flickable.contentY = -100
             flickable.returnToBounds()
         }
     }
@@ -141,14 +137,13 @@
                 }
                 height: implicitHeight
             }
-
         }
     }
 
     ActivityIndicator {
         id: busyIndicator
 
-        running: contactFetch.running
+        running: (root.contact === null) && contactFetch.running
         visible: running
         anchors.centerIn: parent
     }
@@ -156,7 +151,17 @@
     ContactsUI.ContactFetch {
         id: contactFetch
 
-        onContactRemoved: pageStack.pop()
+        onContactRemoved: {
+            pageStack.pop()
+        }
+
+        onContactNotFound: {
+            pageStack.pop()
+        }
+
+        onContactFetched: {
+            root.contact = contact
+        }
     }
 
     tools: ToolbarItems {
@@ -185,4 +190,12 @@
             }
         }
     }
+
+    // This will load the contact information when the app was launched with
+    // the URI: addressbook:///contact?id=<id>
+    Component.onCompleted: {
+        if (contactId !== "") {
+            contactFetch.fetchContact(contactId)
+        }
+    }
 }

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-02-25 20:06:47 +0000
+++ src/imports/MainWindow.qml	2014-03-19 18:42:11 +0000
@@ -17,10 +17,13 @@
 import QtQuick 2.0
 import QtContacts 5.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
 
 MainView {
     id: mainWindow
 
+    property string modelErrorMessage: ""
+
     width: units.gu(40)
     height: units.gu(71)
     anchorToKeyboard: false
@@ -59,6 +62,7 @@
         signal createContactRequested(string phoneNumber)
         signal editContatRequested(string contactId, string phoneNumber)
         signal contactCreated(QtObject contact)
+        signal contactModelError(string errorMessage)
 
         anchors {
             fill: parent
@@ -69,6 +73,11 @@
                 }
             }
        }
+
+       onContactModelError: {
+           modelErrorMessage = errorMessage
+           PopupUtils.open(errorDialog, null)
+       }
     }
 
     Component.onCompleted: {
@@ -76,6 +85,23 @@
         mainWindow.applicationReady()
     }
 
+    Component {
+        id: errorDialog
+
+        Popups.Dialog {
+            id: dialogue
+
+            title: i18n.tr("Error")
+            text: mainWindow.modelErrorMessage
+
+            Button {
+                text: "Cancel"
+                gradient: UbuntuColors.greyGradient
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
     Connections {
         target: UriHandler
         onOpened: {

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml	2014-01-14 20:43:59 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml	2014-03-19 18:42:11 +0000
@@ -20,8 +20,6 @@
 ListModel {
     id: typeModel
 
-    property bool ready: false
-
     signal loaded()
 
     function getTypeIndex(detail) {
@@ -69,6 +67,5 @@
         /*4*/   append({"value": 7, "label": i18n.tr("Skype"), "icon": "artwork:/protocol-skype.svg"})
         /*5*/   append({"value": 8, "label": i18n.tr("Yahoo"), "icon": "artwork:/protocol-yahoo.svg"})
         loaded()
-        ready = true
     }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-01-14 20:43:59 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-03-19 18:42:11 +0000
@@ -20,7 +20,6 @@
 ListModel {
     id: typeModel
 
-    property bool ready: false
     signal loaded()
 
     function getTypeIndex(detail) {
@@ -103,6 +102,5 @@
         append({"value": "Other", "label": i18n.tr("Other"), "icon": null,
                 "context": QtContacts.ContactDetail.ContextOther, "subType": QtContacts.PhoneNumber.Landline })
         loaded()
-        ready = true
     }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactFetch.qml'
--- src/imports/Ubuntu/Contacts/ContactFetch.qml	2013-11-04 14:56:40 +0000
+++ src/imports/Ubuntu/Contacts/ContactFetch.qml	2014-03-19 18:42:11 +0000
@@ -19,9 +19,11 @@
 Item {
     id: root
 
+    readonly property alias contact: connections.contact
+    readonly property alias contactId: connections.contactId
     property alias model: connections.target
+
     property bool running: false
-    property QtObject contact: null
     property bool contactIsDirty: false
 
     property string _pendingId: ""
@@ -29,6 +31,7 @@
 
     signal contactFetched(QtObject contact)
     signal contactRemoved()
+    signal contactNotFound()
 
     function fetchContact(contactId) {
         if (root._ready) {
@@ -58,20 +61,9 @@
         }
     }
 
-    Connections {
-        target: root.model
-
-        onContactsChanged: {
-            if (root.contact) {
-                root.contactIsDirty = true
-
-                for (var i=0; i < root.model.contacts.length; i++) {
-                    if (root.model.contacts[i].contactId == root.contact.contactId) {
-                        return
-                    }
-                }
-                contactRemoved()
-            }
+    onContactChanged: {
+        if (contact == null) {
+            contactRemoved()
         }
     }
 
@@ -79,6 +71,8 @@
         id: connections
 
         property int currentQueryId: -1
+        property QtObject contact: null
+        property string contactId: contact ? contact.contactId : ""
 
         onContactsFetched: {
             // currentQueryId == -2 is used during a fetch using "memory" manager
@@ -86,8 +80,12 @@
                 root.contactIsDirty = false
                 root.running = false
                 currentQueryId = -1
-                root.contact = fetchedContacts[0]
-                root.contactFetched(fetchedContacts[0])
+                if (fetchedContacts.length > 0) {
+                    contact = fetchedContacts[0]
+                    root.contactFetched(fetchedContacts[0])
+                } else {
+                    contactNotFound()
+                }
             }
         }
     }

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-01-28 10:20:07 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-03-19 18:42:11 +0000
@@ -79,7 +79,12 @@
 
     def test_add_email(self):
         self.add_contact("Fulano", "")
-        self.edit_contact(0)
+        edit_page = self.edit_contact(0)
+
+        emailGroup = edit_page.select_single(
+            "ContactDetailGroupWithTypeEditor",
+            objectName="emails")
+        self.create_new_detail(emailGroup)
 
         # fill email address
         email_field = self.main_window.select_single(