Merge lp:~phablet-team/messaging-app/remove_apl_workarounds into lp:messaging-app

[Gustavo Pichorim Boiko]

Now that AdaptivePageLayout supports loading pages synchronously and that the memory management bugs are fixed, remove the workarounds from the app.

Now that AdaptivePageLayout supports loading pages synchronously and that the memory management bugs are fixed, remove the workarounds from the app.

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

FAILED: Continuous integration, rev:575
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/58/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1002/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1002
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/900
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/900
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/900
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/894/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/894/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/894/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/894/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/894/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/894/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/894/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/894/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/894
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/894/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:576
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/59/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1005/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1005
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/903
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/903
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/903
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/897/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/897/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/897/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/897/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/897/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/897/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/897
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/897/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/remove_apl_workarounds]

577. By Gustavo Pichorim Boiko on 2016-07-21

Merge trunk

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

PASSED: Continuous integration, rev:577
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/60/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1019
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/193
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1019
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/917
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/917
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/917
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/911/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/911
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/911/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~phablet-team/messaging-app/remove_apl_workarounds]

578. By Gustavo Pichorim Boiko on 2016-07-25

Merge parent

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

PASSED: Continuous integration, rev:578
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/66/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1037
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/203
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1037
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/933
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/933
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/933
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/927/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/927
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/927/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

nice to get rid of these workarounds.
Thanks.

review: Approve

=== modified file 'src/qml/MMS/Previewer.qml'
--- src/qml/MMS/Previewer.qml	2016-04-21 04:15:31 +0000
+++ src/qml/MMS/Previewer.qml	2016-07-25 17:14:08 +0000
@@ -63,7 +63,7 @@
                     iconName: "back"
                     shortcut: "Esc"
                     onTriggered: {
-                        mainStack.removePage(previewerPage)
+                        mainStack.removePages(previewerPage)
                     }
                 }
             ]
@@ -133,11 +133,11 @@
 
             onPeerSelected: {
                 picker.curTransfer = peer.request();
-                mainStack.removePage(picker);
+                mainStack.removePages(picker);
                 if (picker.curTransfer.state === ContentTransfer.InProgress)
                     picker.__exportItems(picker.url);
             }
-            onCancelPressed: mainStack.removePage(picker);
+            onCancelPressed: mainStack.removePages(picker);
         }
 
         Connections {

=== modified file 'src/qml/MMS/PreviewerMultipleContacts.qml'
--- src/qml/MMS/PreviewerMultipleContacts.qml	2016-04-21 04:15:31 +0000
+++ src/qml/MMS/PreviewerMultipleContacts.qml	2016-07-25 17:14:08 +0000
@@ -58,7 +58,7 @@
             property var contact: thumbnail.vcard.contacts[index]
 
             onClicked: {
-                mainStack.addComponentToCurrentColumnSync(root, sigleContatPreviewer, {'contact': contact})
+                mainStack.addPageToCurrentColumn(root, sigleContatPreviewer, {'contact': contact})
             }
         }
     }

=== modified file 'src/qml/MMSDelegate.qml'
--- src/qml/MMSDelegate.qml	2016-06-28 20:21:42 +0000
+++ src/qml/MMSDelegate.qml	2016-07-25 17:14:08 +0000
@@ -45,7 +45,7 @@
             var properties = {}
             properties["attachment"] = attachment.item.attachment
             properties["thumbnail"] = attachment.item
-            mainStack.addFileToCurrentColumnSync(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
+            mainStack.addPageToCurrentColumn(messages.basePage, Qt.resolvedUrl(attachment.item.previewer), properties)
         }
     }
 

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2016-07-08 13:46:54 +0000
+++ src/qml/MainPage.qml	2016-07-25 17:14:08 +0000
@@ -96,8 +96,7 @@
                     text: i18n.tr("Settings")
                     iconName: "settings"
                     onTriggered: {
-                        emptyStack(false)
-                        pageStack.addFileToNextColumnSync(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
+                        pageStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
                     }
                 },
                 Action {
@@ -282,8 +281,7 @@
                     if (displayedEvent != null) {
                         properties["scrollToEventId"] = displayedEvent.eventId
                     }
-                    emptyStack(false)
-                    mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
+                    mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
 
                     // mark this item as current
                     threadList.currentIndex = index

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-07-13 20:42:55 +0000
+++ src/qml/Messages.qml	2016-07-25 17:14:08 +0000
@@ -676,7 +676,7 @@
                     iconName: "contact"
                     onTriggered: {
                         Qt.inputMethod.hide()
-                        mainStack.addFileToCurrentColumnSync(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
+                        mainStack.addPageToCurrentColumn(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
                     }
                 }
 

=== modified file 'src/qml/MessagingContactEditorPage.qml'
--- src/qml/MessagingContactEditorPage.qml	2016-06-20 12:22:19 +0000
+++ src/qml/MessagingContactEditorPage.qml	2016-07-25 17:14:08 +0000
@@ -55,7 +55,7 @@
     onContactSaved: {
         if (root.contactListPage) {
             if (root.contactListPage.phoneToAdd !== "") {
-                mainStack.removePage(root.contactListPage)
+                mainStack.removePages(root.contactListPage)
             } else {
                 root.contactListPage.moveListToContact(contact)
                 root.contactListPage.phoneToAdd = ""

=== modified file 'src/qml/MessagingContactViewPage.qml'
--- src/qml/MessagingContactViewPage.qml	2016-02-01 20:10:42 +0000
+++ src/qml/MessagingContactViewPage.qml	2016-07-25 17:14:08 +0000
@@ -35,6 +35,7 @@
     readonly property string contactEditorPageURL: Qt.resolvedUrl("MessagingContactEditorPage.qml")
     property string addPhoneToContact: ""
     property var contactListPage: null
+    model: null
 
     function addPhoneToContactImpl(contact, phoneNumber)
     {
@@ -62,7 +63,7 @@
             iconName: "share"
             visible: root.editable
             onTriggered: {
-                pageStack.addComponentToCurrentColumnSync(root, contactShareComponent,
+                pageStack.addPageToCurrentColumn(root, contactShareComponent,
                                { contactModel: root.model,
                                  contacts: [root.contact] })
             }
@@ -73,7 +74,7 @@
             iconName: "edit"
             visible: root.editable
             onTriggered: {
-                pageStack.addFileToCurrentColumnSync(root, contactEditorPageURL,
+                pageStack.addPageToCurrentColumn(root, contactEditorPageURL,
                                { model: root.model,
                                  contact: root.contact,
                                  contactListPage: root.contactListPage })
@@ -123,9 +124,9 @@
         } else {
             Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
         }
-        pageStack.removePage(root)
+        pageStack.removePages(root)
     }
-    onContactRemoved: pageStack.removePage(root)
+    onContactRemoved: pageStack.removePages(root)
     onContactFetched: {
         root.contact = contact
         if (root.active && root.addPhoneToContact != "") {

=== removed file 'src/qml/MessagingPageLayout.qml'
--- src/qml/MessagingPageLayout.qml	2016-05-02 18:35:28 +0000
+++ src/qml/MessagingPageLayout.qml	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright 2016 Canonical Ltd.
- *
- * This file is part of messaging-app.
- *
- * messaging-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * messaging-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 1.3
-
-AdaptivePageLayout {
-    id: layout
-    property var _pagesToRemove: []
-
-    layouts: PageColumnsLayout {
-        when: mainStack.width >= units.gu(90)
-        PageColumn {
-            maximumWidth: units.gu(50)
-            minimumWidth: units.gu(40)
-            preferredWidth: units.gu(40)
-        }
-        PageColumn {
-            fillWidth: true
-        }
-    }
-
-
-    function deleteInstances() {
-        for (var i in _pagesToRemove) {
-            if (_pagesToRemove[i].destroy) {
-                _pagesToRemove[i].destroy()
-            }
-        }
-        _pagesToRemove = []
-    }
-
-    function removePage(page) {
-        // check if this page was allocated dynamically and then remove it
-        for (var i in _pagesToRemove) {
-            if (_pagesToRemove[i] == page) {
-                _pagesToRemove[i].destroy()
-                _pagesToRemove.splice(i, 1)
-                break
-            }
-        }
-        removePages(page)
-    }
-
-    function addFileToNextColumnSync(parentObject, resolvedUrl, properties) {
-        addComponentToNextColumnSync(parentObject, Qt.createComponent(resolvedUrl), properties)
-    }
-
-    function addFileToCurrentColumnSync(parentObject, resolvedUrl, properties) {
-        addComponentToCurrentColumnSync(parentObject, Qt.createComponent(resolvedUrl), properties)
-    }
-
-    function addComponentToNextColumnSync(parentObject, component, properties) {
-        if (typeof(properties) === 'undefined') {
-            properties = {}
-        }
-        var page = component.createObject(parentObject, properties)
-        layout.addPageToNextColumn(parentObject, page)
-        _pagesToRemove.push(page)
-    }
-
-    function addComponentToCurrentColumnSync(parentObject, component, properties) {
-        if (typeof(properties) === 'undefined') {
-            properties = {}
-        }
-        var page = component.createObject(parentObject, properties)
-        layout.addPageToCurrentColumn(parentObject, page)
-        _pagesToRemove.push(page)
-    }
-}

=== modified file 'src/qml/NewRecipientPage.qml'
--- src/qml/NewRecipientPage.qml	2016-06-21 00:56:52 +0000
+++ src/qml/NewRecipientPage.qml	2016-07-25 17:14:08 +0000
@@ -43,7 +43,7 @@
     {
         multiRecipient.addRecipient(phoneNumber)
         multiRecipient.forceActiveFocus()
-        mainStack.removePage(newRecipientPage)
+        mainStack.removePages(newRecipientPage)
     }
 
     header: PageHeader {
@@ -64,7 +64,7 @@
                     text: i18n.tr("Back")
                     iconName: "back"
                     onTriggered: {
-                        mainStack.removePage(newRecipientPage)
+                        mainStack.removePages(newRecipientPage)
                         newRecipientPage.destroy()
                     }
                 }
@@ -190,7 +190,7 @@
 
         onAddNewContactClicked: {
             var newContact = ContactsJS.createEmptyContact(newRecipientPage.phoneToAdd, newRecipientPage)
-            mainStack.addFileToCurrentColumnSync(newRecipientPage,
+            mainStack.addPageToCurrentColumn(newRecipientPage,
                                              Qt.resolvedUrl("MessagingContactEditorPage.qml"),
                                              { model: contactList.listModel,
                                                contact: newContact,

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-07-21 19:47:04 +0000
+++ src/qml/messaging-app.qml	2016-07-25 17:14:08 +0000
@@ -105,8 +105,13 @@
     }
 
     function showContactDetails(currentPage, contact, contactListPage, contactsModel) {
-        var initialProperties =  { "contactListPage": contactListPage,
-                                   "model": contactsModel}
+        var initialProperties = {}
+        if (contactListPage) {
+            initialProperties["contactListPage"] = contactListPage
+        }
+        if (contactsModel) {
+            initialProperties["model"] = contactsModel
+        }
 
         if (typeof(contact) == 'string') {
             initialProperties['contactId'] = contact
@@ -114,34 +119,30 @@
             initialProperties['contact'] = contact
         }
 
-        mainStack.addFileToCurrentColumnSync(currentPage,
+        mainStack.addPageToCurrentColumn(currentPage,
                                          Qt.resolvedUrl("MessagingContactViewPage.qml"),
                                          initialProperties)
     }
 
-    function addNewContact(currentPage, phoneNumber, contactListPage) {
-        mainStack.addFileToCurrentColumnSync(currentPage,
-                                         Qt.resolvedUrl("MessagingContactEditorPage.qml"),
-                                         { "contactId": contactId,
-                                           "addPhoneToContact": phoneNumber,
-                                           "contactListPage": contactListPage })
-    }
-
     function addPhoneToContact(currentPage, contact, phoneNumber, contactListPage, contactsModel) {
         if (contact === "") {
-            mainStack.addFileToCurrentColumnSync(currentPage,
+            mainStack.addPageToCurrentColumn(currentPage,
                                              Qt.resolvedUrl("NewRecipientPage.qml"),
                                              { "phoneToAdd": phoneNumber })
         } else {
-            var initialProperties = { "addPhoneToContact": phoneNumber,
-                                      "contactListPage": contactListPage,
-                                      "model": contactsModel }
+            var initialProperties = { "addPhoneToContact": phoneNumber }
+            if (contactListPage) {
+                initialProperties["contactListPage"] = contactListPage
+            }
+            if (contactsModel) {
+                initialProperties["model"] = contactsModel
+            }
             if (typeof(contact) == 'string') {
                 initialProperties['contactId'] = contact
             } else {
                 initialProperties['contact'] = contact
             }
-            mainStack.addFileToCurrentColumnSync(currentPage,
+            mainStack.addPageToCurrentColumn(currentPage,
                                              Qt.resolvedUrl("MessagingContactViewPage.qml"),
                                              initialProperties)
         }
@@ -288,8 +289,7 @@
     function emptyStack(showEmpty) {
         if (typeof showEmpty === 'undefined') { showEmpty = true; }
         mainView.emptyStackRequested()
-        mainStack.removePage(mainPage)
-        layout.deleteInstances()
+        mainStack.removePages(mainPage)
         if (showEmpty) {
             showEmptyState()
         }
@@ -298,7 +298,7 @@
 
     function showEmptyState() {
         if (mainStack.columns > 1 && !application.findMessagingChild("emptyStatePage")) {
-            layout.addComponentToNextColumnSync(mainPage, emptyStatePageComponent)
+            layout.addPageToNextColumn(mainPage, emptyStatePageComponent)
         }
     }
 
@@ -351,7 +351,7 @@
         emptyStack(false)
         // FIXME: AdaptivePageLayout takes a really long time to create pages,
         // so we create manually and push that
-        mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
+        mainStack.addPageToNextColumn(mainPage, messagesWithBottomEdge, properties)
     }
 
     InputInfo {
@@ -409,30 +409,17 @@
             id: emptyStatePage
             objectName: "emptyStatePage"
 
-            function deleteMe() {
-                emptyStatePage.destroy(1)
-                emptyStatePage.objectName = ""
-            }
-
             Connections {
                 target: layout
                 onColumnsChanged: {
                     if (layout.columns == 1) {
-                        emptyStatePage.deleteMe()
                         if (!application.findMessagingChild("fakeItem")) {
-                            layout.removePage(mainPage)
+                            emptyStack()
                         }
                     }
                 }
             }
 
-            Connections {
-                target: mainView
-                onEmptyStackRequested: {
-                    emptyStatePage.deleteMe()
-                }
-            }
-
             EmptyState {
                 labelVisible: false
             }
@@ -455,9 +442,21 @@
         }
     }
 
-    MessagingPageLayout {
+    AdaptivePageLayout {
         id: layout
         anchors.fill: parent
+        layouts: PageColumnsLayout {
+            when: mainStack.width >= units.gu(90)
+            PageColumn {
+                maximumWidth: units.gu(50)
+                minimumWidth: units.gu(40)
+                preferredWidth: units.gu(40)
+            }
+            PageColumn {
+                fillWidth: true
+            }
+        }
+        asynchronous: false
         primaryPage: MainPage {
             id: mainPage
         }
@@ -467,7 +466,6 @@
         onColumnsChanged: {
             // we only have things to do here in case no thread is selected
             if (layout.completed && layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
-                layout.removePage(mainPage)
                 emptyStack()
             }
         }