Merge lp:~fboucault/address-book-app/startup_time into lp:address-book-app

[Florian Boucault]

Reduced startup time (by 600ms on krillin):
- Bottom edge: delay compiling contact editor page.
- Load Icons asynchronously.
- Made all Components compile asynchronously when possible.

Made startup time overhead when lots of contacts in address book as small as possible

Reduced startup time (by 600ms on krillin):
- Bottom edge: delay compiling contact editor page.
- Load Icons asynchronously.
- Made all Components compile asynchronously when possible.

Made startup time overhead when lots of contacts in address book as small as possible

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:643
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1642/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1642
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1488/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1488/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1488/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1488/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1488/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1488
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1488/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:644
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1765/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1765
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1609/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1609/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1609/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1609/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1609/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1609/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1609/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1609/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1609
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1609/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/29/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-09-29 07:45:50 +0000
+++ debian/control	2016-11-08 15:35:55 +0000
@@ -15,7 +15,7 @@
                dh-translations,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
-               python3,
+               python3:any,
                pkg-config,
                qml-module-qttest [amd64 armhf i386],
                qtdeclarative5-dev-tools [amd64 armhf i386],
 
=== modified file 'debian/control.in'
--- debian/control.in	2016-09-29 07:45:50 +0000
+++ debian/control.in	2016-11-08 15:35:55 +0000
@@ -8,7 +8,7 @@
                dh-translations,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
-               python3,
+               python3:any,
                pkg-config,
                qml-module-qttest [@ARCHS@],
                qtdeclarative5-dev-tools [@ARCHS@],
 
=== added file 'src/imports/ABContactEditorPageWithEmptyContact.qml'
--- src/imports/ABContactEditorPageWithEmptyContact.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ABContactEditorPageWithEmptyContact.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 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.4
+
+import Ubuntu.AddressBook.ContactEditor 0.1
+import Ubuntu.Contacts 0.1 as ContactsUI
+
+ABContactEditorPage {
+    id: contactEditorPage
+    contact: ContactsUI.ContactsJS.createEmptyContact("", contactEditorPage)
+    onCanceled: contactEditorPage.pageStack.removePages(contactEditorPage)
+    onContactSaved: contactEditorPage.pageStack.removePages(contactEditorPage)
+}
 
=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2016-09-19 18:03:45 +0000
+++ src/imports/ABContactListPage.qml	2016-11-08 15:35:55 +0000
@@ -24,7 +24,6 @@
 import Ubuntu.Content 1.3 as ContentHub
 
 import Ubuntu.AddressBook.Base 0.1
-import Ubuntu.AddressBook.ContactShare 0.1
 
 
 Page {
@@ -183,7 +182,8 @@
 
     function importContact(urls)
     {
-        mainPage._busyDialog = PopupUtils.open(busyDialogComponent, mainPage)
+        mainPage._busyDialog = PopupUtils.open(Qt.resolvedUrl("./BusyImportingDialog.qml"), mainPage)
+        mainPage._busyDialog.destruction.connect(function() {mainPage._busyDialog = null})
 
         var importing = false
         for(var i=0, iMax=urls.length; i < iMax; i++) {
@@ -321,7 +321,6 @@
             mainPage.state = "default"
         }
 
-        onError: pageStack.contactModelError(error)
         onCountChanged: {
             if (mainPage.state === "searching") {
                 currentIndex = 0
@@ -587,7 +586,9 @@
                             contacts.push(items.get(i).model.contact)
                         }
 
-                        var dialog = PopupUtils.open(removeContactDialog, null)
+                        var dialog = PopupUtils.open(Qt.resolvedUrl("RemoveContactsDialog.qml"),
+                                                     null,
+                                                     {"contactListModel": contactList.listModel})
                         dialog.contacts = contacts
                         contactList.endSelection()
                     }
@@ -716,67 +717,13 @@
             if (!mainPage.pickMode) {
                 contactExporter.dismissBusyDialog()
                 pageStack.addPageToNextColumn(mainPage,
-                                              contactShareComponent,
+                                              Qt.resolvedUrl("ContactShare/ContactSharePage.qml"),
                                               {contactModel: contactExporter.contactModel,
                                                contacts: contacts })
             }
         }
     }
 
-    Component {
-        id: removeContactDialog
-
-        RemoveContactsDialog {
-            id: removeContactsDialogMessage
-
-            onCanceled: {
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            onAccepted: {
-                removeContacts(contactList.listModel)
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-        }
-    }
-
-    Component {
-        id: busyDialogComponent
-
-        Popups.Dialog {
-            id: busyDialog
-
-            property alias allowToClose: closeButton.visible
-            property alias showActivity: busyIndicator.visible
-
-            title: i18n.tr("Importing...")
-
-            ActivityIndicator {
-                id: busyIndicator
-                running: visible
-                visible: true
-            }
-            Button {
-                id: closeButton
-                text: i18n.tr("Close")
-                visible: false
-                color: UbuntuColors.red
-                onClicked: {
-                    PopupUtils.close(mainPage._busyDialog)
-                    mainPage._busyDialog = null
-                }
-            }
-        }
-    }
-
-    Component {
-        id: contactShareComponent
-
-        ContactSharePage {
-            objectName: "contactSharePage"
-        }
-    }
-
     Component.onCompleted: {
         application.elapsed()
         if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA != "")) {
@@ -796,16 +743,15 @@
         enabled: false
         active: true
         asynchronous: true
-        sourceComponent: ABNewContactBottomEdge {
-            id: bottomEdge
-            parent: mainPage
-            modelToEdit: mainPage.contactModel
-            hint.flickable: contactList.view
-            pageStack: mainPage.pageStack
-            enabled: mainPage.active
-            hintVisible: (pageStack.columns === 1) && bottomEdgeLoader.enabled
-            visible: hintVisible
-        }
+        Component.onCompleted: setSource(Qt.resolvedUrl("ABNewContactBottomEdge.qml"),
+                                         {"parent": mainPage,
+                                          "modelToEdit": Qt.binding(function () {return mainPage.contactModel}),
+                                          "hint.flickable": Qt.binding(function () {return contactList.view}),
+                                          "pageStack": Qt.binding(function () {return mainPage.pageStack}),
+                                          "enabled": Qt.binding(function () {return mainPage.active}),
+                                          "hintVisible": Qt.binding(function () {return mainPage.pageStack.columns === 1}),
+                                          "visible": Qt.binding(function () {return mainPage.pageStack.columns === 1})
+                                         })
     }
 
     Binding {
 
=== modified file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	2016-08-17 18:15:07 +0000
+++ src/imports/ABContactViewPage.qml	2016-11-08 15:35:55 +0000
@@ -21,7 +21,6 @@
 
 import Ubuntu.AddressBook.Base 0.1
 import Ubuntu.AddressBook.ContactView 0.1
-import Ubuntu.AddressBook.ContactShare 0.1
 
 ContactViewPage {
     id: root
@@ -76,7 +75,7 @@
             iconName: "share"
             onTriggered: {
                 pageStack.addPageToCurrentColumn(root,
-                                                 contactShareComponent,
+                                                 Qt.resolvedUrl("ContactShare/ContactSharePage.qml"),
                                                  {contactModel: root.model,
                                                   contacts: [root.contact]})
             }
@@ -115,27 +114,20 @@
         Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
     }
 
-    Component {
-        id: contactShareComponent
-        ContactSharePage {}
-    }
-
     Loader {
         id: bottomEdgeLoader
 
         asynchronous: true
-        sourceComponent: ABNewContactBottomEdge {
-            id: bottomEdge
-
-            parent: root
-            height: root.height
-            modelToEdit: root.model
-            hint.flickable: root.flickable
-            pageStack: root.pageStack
-            hintVisible: false
-            enabled: !root.editing
-            visible: (pageStack.columns > 1)
-        }
+        Component.onCompleted: setSource(Qt.resolvedUrl("ABNewContactBottomEdge.qml"),
+                                         {"parent": root,
+                                          "height": Qt.binding(function () {return root.height}),
+                                          "modelToEdit": Qt.binding(function () {return root.model}),
+                                          "hint.flickable": Qt.binding(function () {return root.flickable}),
+                                          "pageStack": Qt.binding(function () {return root.pageStack}),
+                                          "hintVisible": false,
+                                          "enabled": Qt.binding(function () {return !root.editing}),
+                                          "visible": Qt.binding(function () {return root.pageStack.columns > 1})
+                                         })
     }
 
     Binding {
 
=== modified file 'src/imports/ABEmptyState.qml'
--- src/imports/ABEmptyState.qml	2015-12-15 20:00:44 +0000
+++ src/imports/ABEmptyState.qml	2016-11-08 15:35:55 +0000
@@ -44,6 +44,7 @@
         width: units.gu(5)
         opacity: 0.3
         name: "contact"
+        asynchronous: true
     }
     Label {
         id: emptyStateLabel
 
=== modified file 'src/imports/ABMultiColumnEmptyState.qml'
--- src/imports/ABMultiColumnEmptyState.qml	2016-08-17 18:15:07 +0000
+++ src/imports/ABMultiColumnEmptyState.qml	2016-11-08 15:35:55 +0000
@@ -65,16 +65,18 @@
         id: bottomEdgeLoader
 
         asynchronous: true
-        sourceComponent: ABNewContactBottomEdge {
-            id: bottomEdge
+        Component.onCompleted: setSource(Qt.resolvedUrl("ABNewContactBottomEdge.qml"),
+                                         {"hintVisible": false,
+                                          "visible": Qt.binding(function () {return mainPage.pageStack.columns > 1}),
+                                          "parent": root,
+                                          "height": Qt.binding(function () {return root.height}),
+                                          "modelToEdit": Qt.binding(function () {return root.model}),
+                                          "hint.flickable": Qt.binding(function () {return root.flickable}),
+                                          "pageStack": Qt.binding(function () {return root.pageStack})
+                                         })
 
-            hintVisible: false
-            visible: (pageStack.columns > 1)
-            parent: root
-            height: root.height
-            modelToEdit: root.model
-            hint.flickable: root.flickable
-            pageStack: root.pageStack
+        Connections {
+            target: bottomEdgeLoader.item
             onCommitCompleted: { root.openBottomEdgeWhenReady = false }
         }
 
 
=== modified file 'src/imports/ABNewContactBottomEdge.qml'
--- src/imports/ABNewContactBottomEdge.qml	2016-08-18 12:50:33 +0000
+++ src/imports/ABNewContactBottomEdge.qml	2016-11-08 15:35:55 +0000
@@ -49,8 +49,9 @@
             properties[contact] = bottomEdge._contactToEdit
 
 
-        var incubator = pageStack.addPageToNextColumn(bottomEdge.parent, editorPageBottomEdge, properties)
+        var incubator = pageStack.addPageToNextColumn(bottomEdge.parent, bottomEdge.contentUrl, properties)
         incubator.forceCompletion()
+        setContactEditorPageProperties(incubator.object)
         pageStack.bottomEdgeFloatingPage = incubator.object
         incubator.object.Component.onDestruction.connect(function() {
             pageStack.bottomEdgeFloatingPage = null
@@ -68,28 +69,32 @@
         }
     }
 
-    contentComponent: editorPageBottomEdge
-    preloadContent: visible
+    contentUrl: Qt.resolvedUrl("ABContactEditorPageWithEmptyContact.qml")
+    onContentItemChanged: setContactEditorPageProperties(bottomEdge.contentItem)
+    preloadContent: false
+
+    Timer {
+        interval: 1
+        repeat: false
+        running: bottomEdge.visible
+        onTriggered: bottomEdge.preloadContent = true
+    }
 
     onCommitCompleted: {
         pushPage()
         collapse()
     }
 
-    Component {
-        id: editorPageBottomEdge
-
-        ABContactEditorPage {
-            id: editorPageItem
-
-            implicitHeight: mainWindow.height
-            implicitWidth: parent ? parent.width : bottomEdge.width
-            enabled: false
-            model: bottomEdge.modelToEdit
-            contact: ContactsUI.ContactsJS.createEmptyContact("", editorPageItem)
-            onCanceled: pageStack.removePages(editorPageItem)
-            onContactSaved: pageStack.removePages(editorPageItem)
-            pageStack: bottomEdge.pageStack
+    function setContactEditorPageProperties(contactEditorPage) {
+        if (contactEditorPage) {
+            contactEditorPage.implicitHeight = Qt.binding(function () {return mainWindow.height;});
+            contactEditorPage.implicitWidth = Qt.binding(function () {
+                return contactEditorPage.parent ? contactEditorPage.parent.width
+                                                : bottomEdge.width;
+            });
+            contactEditorPage.enabled = false;
+            contactEditorPage.model = Qt.binding(function () {return bottomEdge.modelToEdit;});
+            contactEditorPage.pageStack = Qt.binding(function () {return bottomEdge.pageStack;});
         }
     }
 }
 
=== added file 'src/imports/BusyImportingDialog.qml'
--- src/imports/BusyImportingDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/BusyImportingDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
+
+import Ubuntu.AddressBook.Base 0.1
+
+Popups.Dialog {
+    id: busyImportingDialog
+
+    property alias allowToClose: closeButton.visible
+    property alias showActivity: busyIndicator.visible
+    signal destruction
+
+    title: i18n.tr("Importing...")
+
+    ActivityIndicator {
+        id: busyIndicator
+        running: visible
+        visible: true
+    }
+    Button {
+        id: closeButton
+        text: i18n.tr("Close")
+        visible: false
+        color: UbuntuColors.red
+        onClicked: {
+            busyImportingDialog.destruction()
+            PopupUtils.close(busyImportingDialog)
+        }
+    }
+}
 
=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2016-02-12 20:40:02 +0000
+++ src/imports/CMakeLists.txt	2016-11-08 15:35:55 +0000
@@ -4,12 +4,15 @@
     ABAdaptivePageLayout.qml
     ABContactListPage.qml
     ABContactEditorPage.qml
+    ABContactEditorPageWithEmptyContact.qml
     ABContactViewPage.qml
     ABEmptyState.qml
     ABNewContactBottomEdge.qml
     ABMultiColumnEmptyState.qml
     ContentHubProxy.qml
     MainWindow.qml
+    RemoveContactsDialog.qml
+    BusyImportingDialog.qml
 )
 
 install(FILES ${ADDRESS_BOOK_APP_QMLS}
 
=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2016-08-17 18:15:07 +0000
+++ src/imports/MainWindow.qml	2016-11-08 15:35:55 +0000
@@ -223,23 +223,6 @@
         value: mainStack.hasMouse
     }
 
-    Component {
-        id: errorDialog
-
-        Popups.Dialog {
-            id: dialogue
-
-            title: i18n.tr("Error")
-            text: mainWindow.modelErrorMessage
-
-            Button {
-                text: i18n.tr("Cancel")
-                gradient: UbuntuColors.greyGradient
-                onClicked: PopupUtils.close(dialogue)
-            }
-        }
-    }
-
     Connections {
         target: UriHandler
         onOpened: {
 
=== added file 'src/imports/RemoveContactsDialog.qml'
--- src/imports/RemoveContactsDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/RemoveContactsDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
+import Ubuntu.AddressBook.Base 0.1
+
+RemoveContactsDialog {
+    id: removeContactsDialog
+
+    property var contactListModel
+
+    onCanceled: {
+        PopupUtils.close(removeContactsDialog)
+    }
+    
+    onAccepted: {
+        removeContactsDialog.removeContacts(removeContactsDialog.contactListModel)
+        PopupUtils.close(removeContactsDialog)
+    }
+}
 
=== added file 'src/imports/Ubuntu/AddressBook/Base/BusyExportingDialog.qml'
--- src/imports/Ubuntu/AddressBook/Base/BusyExportingDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/Base/BusyExportingDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Dialog {
+    title: i18n.dtr("address-book-app", "Exporting contacts...")
+
+    ActivityIndicator {
+        id: activity
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        running: true
+    }
+}
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt'
--- src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt	2015-04-29 18:39:01 +0000
+++ src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt	2016-11-08 15:35:55 +0000
@@ -1,4 +1,5 @@
 set(AB_CONTACT_COMMON_QMLS
+    BusyExportingDialog.qml
     ContactDetailBase.qml
     ContactDetailItem.qml
     ContactDetailGroupBase.qml
 
=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2016-03-16 16:13:17 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml	2016-11-08 15:35:55 +0000
@@ -44,7 +44,7 @@
         }
 
         if (!priv.busyDialog) {
-            priv.busyDialog = PopupUtils.open(busyDialogComponent, root)
+            priv.busyDialog = PopupUtils.open(Qt.resolvedUrl("BusyExportingDialog.qml"), root)
         }
 
         var ids = []
@@ -159,19 +159,4 @@
             }
         }
     }
-
-    Component {
-        id: busyDialogComponent
-
-        Dialog {
-            title: i18n.dtr("address-book-app", "Exporting contacts...")
-
-            ActivityIndicator {
-                id: activity
-
-                anchors.horizontalCenter: parent.horizontalCenter
-                running: true
-            }
-        }
-    }
 }
 
=== added file 'src/imports/Ubuntu/AddressBook/ContactEditor/AlertMessageDialog.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/AlertMessageDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/AlertMessageDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012-2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Contacts 0.1 as ContactsUI
+
+Dialog {
+    id: alertMessageDialog
+
+    property QtObject contact: null
+    signal destruction
+
+    title: i18n.dtr("address-book-app", "Contact Editor")
+    text: {
+        if (ContactsUI.Contacts.updateIsRunning) {
+            return i18n.dtr("address-book-app",
+                            "Your <b>%1</b> contact sync account needs to be upgraded.\nWait until the upgrade is complete to edit contacts.")
+                            .arg(alertMessageDialog.contact.syncTarget.syncTarget)
+        }
+        if (Qt.application.name === "AddressBookApp") {
+              i18n.dtr("address-book-app",
+                       "Your <b>%1</b> contact sync account needs to be upgraded. Use the sync button to upgrade the Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
+                .arg(alertMessageDialog.contact.syncTarget.syncTarget)
+        } else {
+              i18n.dtr("address-book-app",
+                       "Your <b>%1</b> contact sync account needs to be upgraded by running Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
+                .arg(alertMessageDialog.contact.syncTarget.syncTarget);
+        }
+    }
+
+    Button {
+        text: i18n.dtr("address-book-app", "Close")
+        onClicked: PopupUtils.close(alertMessageDialog)
+    }
+
+    Component.onCompleted: Qt.inputMethod.hide()
+}
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2016-03-16 16:13:17 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml	2016-11-08 15:35:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Canonical, Ltd.
+ * Copyright (C) 2012-2016 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
@@ -18,7 +18,6 @@
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 1.3
 
 Item {
     id: root
@@ -30,88 +29,12 @@
     function requestNewAvatar()
     {
         if (!root.importDialog) {
-            root.importDialog = PopupUtils.open(contentHubDialog, null)
+            root.importDialog = PopupUtils.open(Qt.resolvedUrl("AvatarImportDialog.qml"), null)
+            root.importDialog.avatarReceived.connect(root.avatarReceived)
+            root.importDialog.destruction.connect(function () {root.importDialog = null})
+
         } else {
             console.warn("Import dialog already running")
         }
     }
-
-    Component {
-        id: contentHubDialog
-
-        PopupBase {
-            id: dialogue
-
-            property alias activeTransfer: signalConnections.target
-
-            parent: QuickUtils.rootItem(this)
-            focus: true
-
-            Rectangle {
-                anchors.fill: parent
-
-                ContentTransferHint {
-                    anchors.fill: parent
-                    activeTransfer: dialogue.activeTransfer
-                }
-
-                ContentPeerPicker {
-                    id: peerPicker
-
-                    anchors.fill: parent
-                    contentType: ContentType.Pictures
-                    handler: ContentHandler.Source
-
-                    onPeerSelected: {
-                        peer.selectionType = ContentTransfer.Single
-                        dialogue.activeTransfer = peer.request()
-                    }
-
-                    onCancelPressed: {
-                        PopupUtils.close(root.importDialog)
-                    }
-                }
-            }
-
-            Connections {
-                id: signalConnections
-
-                onStateChanged: {
-                    var done = ((dialogue.activeTransfer.state === ContentTransfer.Charged) ||
-                                (dialogue.activeTransfer.state === ContentTransfer.Aborted))
-
-                    if (dialogue.activeTransfer.state === ContentTransfer.Charged) {
-                        if (dialogue.activeTransfer.items.length > 0) {
-                            root.avatarReceived(dialogue.activeTransfer.items[0].url)
-                        }
-                    }
-
-                    if (done) {
-                        acceptTimer.restart()
-                    }
-                }
-            }
-
-            // WORKAROUND: Work around for application becoming insensitive to touch events
-            // if the dialog is dismissed while the application is inactive.
-            // Just listening for changes to Qt.application.active doesn't appear
-            // to be enough to resolve this, so it seems that something else needs
-            // to be happening first. As such there's a potential for a race
-            // condition here, although as yet no problem has been encountered.
-            Timer {
-                id: acceptTimer
-
-                interval: 100
-                repeat: true
-                running: false
-                onTriggered: {
-                    if(Qt.application.state === Qt.ApplicationActive) {
-                       PopupUtils.close(root.importDialog)
-                   }
-                }
-            }
-
-            Component.onDestruction: root.importDialog = null
-        }
-    }
 }
 
=== added file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImportDialog.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImportDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImportDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 1.3
+
+PopupBase {
+    id: dialogue
+
+    property alias activeTransfer: signalConnections.target
+    signal avatarReceived(string avatarUrl)
+    signal destruction()
+
+    parent: QuickUtils.rootItem(this)
+    focus: true
+
+    Rectangle {
+        anchors.fill: parent
+
+        ContentTransferHint {
+            anchors.fill: parent
+            activeTransfer: dialogue.activeTransfer
+        }
+
+        ContentPeerPicker {
+            id: peerPicker
+
+            anchors.fill: parent
+            contentType: ContentType.Pictures
+            handler: ContentHandler.Source
+
+            onPeerSelected: {
+                peer.selectionType = ContentTransfer.Single
+                dialogue.activeTransfer = peer.request()
+            }
+
+            onCancelPressed: {
+                PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Connections {
+        id: signalConnections
+
+        onStateChanged: {
+            var done = ((dialogue.activeTransfer.state === ContentTransfer.Charged) ||
+                        (dialogue.activeTransfer.state === ContentTransfer.Aborted))
+
+            if (dialogue.activeTransfer.state === ContentTransfer.Charged) {
+                if (dialogue.activeTransfer.items.length > 0) {
+                    dialogue.avatarReceived(dialogue.activeTransfer.items[0].url)
+                }
+            }
+
+            if (done) {
+                acceptTimer.restart()
+            }
+        }
+    }
+
+    // WORKAROUND: Work around for application becoming insensitive to touch events
+    // if the dialog is dismissed while the application is inactive.
+    // Just listening for changes to Qt.application.active doesn't appear
+    // to be enough to resolve this, so it seems that something else needs
+    // to be happening first. As such there's a potential for a race
+    // condition here, although as yet no problem has been encountered.
+    Timer {
+        id: acceptTimer
+
+        interval: 100
+        repeat: true
+        running: false
+        onTriggered: {
+            if(Qt.application.state === Qt.ApplicationActive) {
+               PopupUtils.close(dialogue)
+           }
+        }
+    }
+
+    Component.onDestruction: dialogue.destruction()
+}
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt'
--- src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt	2015-09-24 18:48:34 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt	2016-11-08 15:35:55 +0000
@@ -1,5 +1,7 @@
 set(AB_CONTACT_EDITOR_QMLS
+    AlertMessageDialog.qml
     AvatarImport.qml
+    AvatarImportDialog.qml
     ComboButtonAddField.qml
     ContactDetailAddressesEditor.qml
     ContactDetailAvatarEditor.qml
@@ -12,6 +14,7 @@
     ContactDetailSyncTargetEditor.qml
     ContactDetailWithTypeEditor.qml
     ContactEditorPage.qml
+    RemoveContactsDialog.qml
     TextInputDetail.qml
     ValueSelector.qml
     qmldir
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-08-18 13:24:57 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2016-11-08 15:35:55 +0000
@@ -364,11 +364,15 @@
                     left: parent.left
                     right: parent.right
                 }
+                property var alertMessageDialog
                 onChanged: {
                     if (contactEditor.enabled &&
                         !contactEditor.isNewContact &&
                         syncTargetEditor.contactIsReadOnly(contactEditor.contact)) {
-                        PopupUtils.open(alertMessage)
+                        syncTargetEditor.alertMessageDialog = PopupUtils.open(Qt.resolvedUrl("AlertMessageDialog.qml"),
+                                                                              null,
+                                                                              {"contact": contactEditor.contact})
+                        syncTargetEditor.alertMessageDialog.destruction.connect(contactEditor.close)
                     }
                 }
             }
@@ -463,7 +467,8 @@
                     enabled: contactEditor.active && deleteButton.visible
                     shortcut: "Ctrl+Delete"
                     onTriggered: {
-                        var dialog = PopupUtils.open(removeContactDialog, null)
+                        var dialog = PopupUtils.open(Qt.resolvedUrl("RemoveContactsDialog.qml"), null,
+                                                     {"contactEditor": contactEditor})
                         dialog.contacts = [contactEditor.contact]
                     }
                 }
@@ -500,79 +505,4 @@
 
         focusTimer.restart()
     }
-
-    Component {
-        id: alertMessage
-
-        Dialog {
-            id: aletMessageDialog
-
-            title: i18n.dtr("address-book-app", "Contact Editor")
-            text: {
-                if (ContactsUI.Contacts.updateIsRunning) {
-                    return i18n.dtr("address-book-app",
-                                    "Your <b>%1</b> contact sync account needs to be upgraded.\nWait until the upgrade is complete to edit contacts.")
-                                    .arg(contactEditor.contact.syncTarget.syncTarget)
-                }
-                if (Qt.application.name === "AddressBookApp") {
-                      i18n.dtr("address-book-app",
-                               "Your <b>%1</b> contact sync account needs to be upgraded. Use the sync button to upgrade the Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
-                        .arg(contactEditor.contact.syncTarget.syncTarget)
-                } else {
-                      i18n.dtr("address-book-app",
-                               "Your <b>%1</b> contact sync account needs to be upgraded by running Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
-                        .arg(contactEditor.contact.syncTarget.syncTarget);
-                }
-            }
-
-            Button {
-                text: i18n.dtr("address-book-app", "Close")
-                onClicked: PopupUtils.close(aletMessageDialog)
-            }
-
-            Component.onCompleted: Qt.inputMethod.hide()
-            Component.onDestruction: contactEditor.pageStack.removePages(contactEditor)
-        }
-    }
-
-    Component {
-        id: removeContactDialog
-
-        RemoveContactsDialog {
-            id: removeContactsDialogMessage
-
-            property bool popPages: false
-
-            onCanceled: {
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            onAccepted: {
-                popPages = true
-                removeContacts(contactEditor.model)
-                PopupUtils.close(removeContactsDialogMessage)
-            }
-
-            // hide virtual keyboard if necessary
-            Component.onCompleted: {
-                contactEditor.enabled = false
-                Qt.inputMethod.hide()
-            }
-
-            // WORKAROUND: SDK element crash if pop the page where the dialog was created
-            Component.onDestruction: {
-                contactEditor.enabled = true
-                if (popPages) {
-                    if (contactEditor.pageStack.removePages) {
-                        contactEditor.pageStack.removePages(contactEditor)
-                    } else {
-                        contactEditor.pageStack.pop() // editor page
-                        contactEditor.pageStack.pop() // view page
-                    }
-                }
-                if (contactEditor.pageStack.primaryPage)
-                    contactEditor.pageStack.primaryPage.forceActiveFocus()
-            }
-        }
-    }
 }
 
=== added file 'src/imports/Ubuntu/AddressBook/ContactEditor/RemoveContactsDialog.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/RemoveContactsDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/RemoveContactsDialog.qml	2016-11-08 15:35:55 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012-2016 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.4
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+import Ubuntu.AddressBook.Base 0.1
+
+RemoveContactsDialog {
+    id: removeContactsDialogMessage
+
+    property bool popPages: false
+    property var contactEditor
+
+    onCanceled: {
+        PopupUtils.close(removeContactsDialogMessage)
+    }
+
+    onAccepted: {
+        popPages = true
+        removeContacts(contactEditor.model)
+        PopupUtils.close(removeContactsDialogMessage)
+    }
+
+    // hide virtual keyboard if necessary
+    Component.onCompleted: {
+        contactEditor.enabled = false
+        Qt.inputMethod.hide()
+    }
+
+    // WORKAROUND: SDK element crash if pop the page where the dialog was created
+    Component.onDestruction: {
+        contactEditor.enabled = true
+        if (popPages) {
+            if (contactEditor.pageStack.removePages) {
+                contactEditor.pageStack.removePages(contactEditor)
+            } else {
+                contactEditor.pageStack.pop() // editor page
+                contactEditor.pageStack.pop() // view page
+            }
+        }
+        if (contactEditor.pageStack.primaryPage)
+            contactEditor.pageStack.primaryPage.forceActiveFocus()
+    }
+}
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml	2016-11-08 15:35:55 +0000
@@ -97,6 +97,7 @@
             color: "black"
             height: units.gu(1)
             width: height
+            asynchronous: true
 
             anchors {
                 verticalCenter: parent.verticalCenter
@@ -169,6 +170,7 @@
                 height: visible ? units.gu(1) : 0
                 width: height
                 visible: index < (listView.count - 1)
+                asynchronous: true
 
                 anchors {
                     verticalCenter: listLabel.verticalCenter
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-11-19 16:38:36 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2016-11-08 15:35:55 +0000
@@ -31,5 +31,6 @@
         height: root.iconSize
         width: root.iconSize
         color: root.activeFocus ? UbuntuColors.orange : "gray"
+        asynchronous: true
     }
 }
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-12-10 19:13:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2016-11-08 15:35:55 +0000
@@ -46,6 +46,7 @@
         anchors.fill: parent
         fillMode: Image.PreserveAspectCrop
         visible: false
+        asynchronous: true
     }
 
     FastBlur {
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-12-10 19:13:20 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2016-11-08 15:35:55 +0000
@@ -81,5 +81,6 @@
         name: root.action ? root.action.iconName : ""
         color: root.activeFocus ? UbuntuColors.orange : "gray"
         visible: width > 0
+        asynchronous: true
     }
 }
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2016-03-02 14:32:16 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2016-11-08 15:35:55 +0000
@@ -82,15 +82,11 @@
         anchors.centerIn: parent
     }
 
-    ContactFetchError {
-        id: fetchErrorDialog
-    }
-
     ContactFetch {
         id: contactFetch
 
         onContactRemoved: root.contactRemoved()
-        onContactNotFound: PopupUtils.open(fetchErrorDialog, root)
+        onContactNotFound: PopupUtils.open(Qt.resolvedUrl("ContactFetchError.qml"), root)
         onContactFetched: {
             root.contact = contact
             root.contactFetched(root.contact)
 
=== modified file 'src/imports/Ubuntu/Contacts/ActionButton.qml'
--- src/imports/Ubuntu/Contacts/ActionButton.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ActionButton.qml	2016-11-08 15:35:55 +0000
@@ -30,5 +30,6 @@
         anchors.centerIn: parent
         height: root.iconSize
         width: root.iconSize
+        asynchronous: true
     }
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2016-05-04 21:00:18 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2016-11-08 15:35:55 +0000
@@ -85,5 +85,6 @@
         anchors.centerIn: avatar
         height: units.gu(3)
         width: height
+        asynchronous: true
     }
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2016-01-21 21:30:32 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml	2016-11-08 15:35:55 +0000
@@ -122,6 +122,7 @@
                         height: units.gu(3)
                         width: height
                         anchors.verticalCenter: parent.verticalCenter
+                        asynchronous: true
                     }
                 }
             }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2016-01-21 21:30:32 +0000
+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml	2016-11-08 15:35:55 +0000
@@ -52,6 +52,7 @@
        backgroundColor: Theme.palette.normal.overlay
        source: Image {
            source: root.expandIcon ? root.iconSource : ""
+           asynchronous: true
        }
        Image {
            anchors.centerIn: parent
@@ -59,6 +60,7 @@
            visible: !root.expandIcon
            width: units.gu(2)
            height: units.gu(2)
+           asynchronous: true
        }
        visible: root.showContents
    }
 
=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-05-26 18:52:14 +0000
+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml	2016-11-08 15:35:55 +0000
@@ -205,6 +205,7 @@
             color: Theme.palette.selected.field
             height: units.gu(3)
             width: units.gu(3)
+            asynchronous: true
         }
     }
 
@@ -247,6 +248,7 @@
                        height: units.gu(3)
                        name: modelData.iconName
                        color: root.activeAction === modelData ? UbuntuColors.orange : UbuntuColors.lightGrey
+                       asynchronous: true
                    }
               }
            }
 
=== modified file 'tests/qml/tst_ContactList.qml'
--- tests/qml/tst_ContactList.qml	2015-10-26 13:18:11 +0000
+++ tests/qml/tst_ContactList.qml	2016-11-08 15:35:55 +0000
@@ -38,6 +38,7 @@
         property string callbackApplication: ""
         property bool firstRun: true
         property bool disableOnlineAccounts: true
+        property bool isOnline: false
 
         function elapsed()
         {
@@ -59,6 +60,12 @@
 
     MainView {
         id: mainView
+        pageStack: Item {
+            property var contactListPage: null
+            readonly property int columns: 1
+            readonly property bool hasKeyboard: false
+        }
+
         anchors.fill: parent
     }
 
@@ -86,6 +93,9 @@
 
         function cleanup()
         {
+            //WORKAROUND: avoid problems with async object
+            //if the test run too fast it can cause problems with async objects
+            wait(1000)
             root.contactListPageObj.destroy()
         }