Merge lp:~boiko/messaging-app/fix_thread_removing into lp:messaging-app

[Gustavo Pichorim Boiko]

Instead of creating the pages statically, incubator.forceCompletion() to force the page creation to be fast.
Also, when removing one thread, move to the next one on the list.

Instead of creating the pages statically, incubator.forceCompletion() to force the page creation to be fast.
Also, when removing one thread, move to the next one on the list.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/968/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6703/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/477/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6714/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/968/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:519
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/662/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/662/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

519. By Gustavo Pichorim Boiko on 2016-03-03

Instead of creating the pages statically, incubator.forceCompletion() to force
the page creation to be fast.
Also, when removing one thread, move to the next one on the list.

516. By Launchpad Translations on behalf of phablet-team on 2016-02-25

Launchpad automatic translations update.

=== modified file 'src/qml/MMS/Previewer.qml'
--- src/qml/MMS/Previewer.qml	2016-02-01 20:10:42 +0000
+++ src/qml/MMS/Previewer.qml	2016-03-03 14:15:15 +0000
@@ -120,11 +120,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/MainPage.qml'
--- src/qml/MainPage.qml	2016-02-12 13:15:42 +0000
+++ src/qml/MainPage.qml	2016-03-03 14:15:15 +0000
@@ -242,6 +242,23 @@
             // FIXME: find a better unique name
             objectName: "thread%1".arg(participants[0].identifier)
 
+            function activate() {
+                var properties = model.properties
+                properties["keyboardFocus"] = false
+                properties["threads"] = model.threads
+                var participantIds = [];
+                for (var i in model.participants) {
+                    participantIds.push(model.participants[i].identifier)
+                }
+                properties["participantIds"] = participantIds
+                properties["participants"] = model.participants
+                properties["presenceRequest"] = threadDelegate.presenceItem
+                if (displayedEvent != null) {
+                    properties["scrollToEventId"] = displayedEvent.eventId
+                }
+                mainStack.addPageToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
+            }
+
             anchors {
                 left: parent.left
                 right: parent.right
@@ -264,22 +281,6 @@
                         threadList.deselectItem(threadDelegate)
                     }
                 } else {
-                    var properties = model.properties
-                    properties["keyboardFocus"] = false
-                    properties["threads"] = model.threads
-                    var participantIds = [];
-                    for (var i in model.participants) {
-                        participantIds.push(model.participants[i].identifier)
-                    }
-                    properties["participantIds"] = participantIds
-                    properties["participants"] = model.participants
-                    properties["presenceRequest"] = threadDelegate.presenceItem
-                    if (displayedEvent != null) {
-                        properties["scrollToEventId"] = displayedEvent.eventId
-                    }
-                    emptyStack()
-                    mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
-
                     // mark this item as current
                     threadList.currentIndex = index
                 }
@@ -302,6 +303,12 @@
             }
         }
 
+        onCurrentItemChanged: {
+            if (currentItem && currentItem.activate) {
+                currentItem.activate()
+            }
+        }
+
         Binding {
             target: threadList
             property: 'contentY'

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-03-03 14:15:14 +0000
+++ src/qml/Messages.qml	2016-03-03 14:15:15 +0000
@@ -641,7 +641,7 @@
                     iconName: "contact"
                     onTriggered: {
                         Qt.inputMethod.hide()
-                        mainStack.addFileToCurrentColumnSync(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
+                        mainStack.addPageToCurrentColumnSync(messages.basePage,  Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient})
                     }
                 }
 

=== modified file 'src/qml/MessagingContactEditorPage.qml'
--- src/qml/MessagingContactEditorPage.qml	2016-02-01 20:10:42 +0000
+++ src/qml/MessagingContactEditorPage.qml	2016-03-03 14:15:15 +0000
@@ -53,7 +53,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-03-03 14:15:15 +0000
@@ -123,9 +123,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 != "") {

=== modified file 'src/qml/MessagingPageLayout.qml'
--- src/qml/MessagingPageLayout.qml	2016-02-05 21:19:56 +0000
+++ src/qml/MessagingPageLayout.qml	2016-03-03 14:15:15 +0000
@@ -3,52 +3,14 @@
 
 AdaptivePageLayout {
     id: layout
-    property var _pagesToRemove: []
-
-    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)
+
+    function addPageToNextColumnSync(parentObject, page, properties) {
+        var incubator = addPageToNextColumn(parentObject, page, properties)
+        incubator.forceCompletion()
+    }
+
+    function addPageToCurrentColumnSync(parentObject, page, properties) {
+        var incubator = addPageToCurrentColumn(parentObject, page, properties)
+        incubator.forceCompletion()
     }
 }

=== modified file 'src/qml/NewRecipientPage.qml'
--- src/qml/NewRecipientPage.qml	2016-02-01 20:10:42 +0000
+++ src/qml/NewRecipientPage.qml	2016-03-03 14:15:15 +0000
@@ -43,7 +43,7 @@
     {
         multiRecipient.addRecipient(phoneNumber)
         multiRecipient.forceActiveFocus()
-        mainStack.removePage(newRecipientPage)
+        mainStack.removePages(newRecipientPage)
     }
 
     header: PageHeader {
@@ -64,8 +64,7 @@
                     text: i18n.tr("Back")
                     iconName: "back"
                     onTriggered: {
-                        mainStack.removePage(newRecipientPage)
-                        newRecipientPage.destroy()
+                        mainStack.removePages(newRecipientPage)
                     }
                 }
             ]

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-03-03 14:15:14 +0000
+++ src/qml/messaging-app.qml	2016-03-03 14:15:15 +0000
@@ -73,13 +73,13 @@
             initialProperties['contact'] = contact
         }
 
-        mainStack.addFileToCurrentColumnSync(currentPage,
+        mainStack.addPageToCurrentColumnSync(currentPage,
                                          Qt.resolvedUrl("MessagingContactViewPage.qml"),
                                          initialProperties)
     }
 
     function addNewContact(currentPage, phoneNumber, contactListPage) {
-        mainStack.addFileToCurrentColumnSync(currentPage,
+        mainStack.addPageToCurrentColumnSync(currentPage,
                                          Qt.resolvedUrl("MessagingContactEditorPage.qml"),
                                          { "contactId": contactId,
                                            "addPhoneToContact": phoneNumber,
@@ -88,7 +88,7 @@
 
     function addPhoneToContact(currentPage, contact, phoneNumber, contactListPage, contactsModel) {
         if (contact === "") {
-            mainStack.addFileToCurrentColumnSync(currentPage,
+            mainStack.addPageToCurrentColumnSync(currentPage,
                                              Qt.resolvedUrl("NewRecipientPage.qml"),
                                              { "phoneToAdd": phoneNumber })
         } else {
@@ -100,7 +100,7 @@
             } else {
                 initialProperties['contact'] = contact
             }
-            mainStack.addFileToCurrentColumnSync(currentPage,
+            mainStack.addPageToCurrentColumnSync(currentPage,
                                              Qt.resolvedUrl("MessagingContactViewPage.qml"),
                                              initialProperties)
         }
@@ -228,15 +228,14 @@
     }
 
     function emptyStack() {
-        mainStack.removePage(mainPage)
-        layout.deleteInstances()
+        mainStack.removePages(mainPage)
         showEmptyState()
         mainPage.displayedThreadIndex = -1
     }
 
     function showEmptyState() {
         if (mainStack.columns > 1 && !application.findChild("emptyStatePage")) {
-            layout.addComponentToNextColumnSync(mainPage, emptyStatePageComponent)
+            layout.addPageToNextColumnSync(mainPage, emptyStatePageComponent)
         }
     }
 
@@ -289,7 +288,7 @@
         emptyStack()
         // FIXME: AdaptivePageLayout takes a really long time to create pages,
         // so we create manually and push that
-        mainStack.addComponentToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
+        mainStack.addPageToNextColumnSync(mainPage, messagesWithBottomEdge, properties)
     }
 
     InputInfo {
@@ -345,9 +344,8 @@
                 target: layout
                 onColumnsChanged: {
                     if (layout.columns == 1) {
-                        emptyStatePage.destroy()
                         if (!application.findChild("fakeItem")) {
-                            layout.removePage(mainPage)
+                            layout.removePages(mainPage)
                         }
                     }
                 }
@@ -380,7 +378,6 @@
         onColumnsChanged: {
             // we only have things to do here in case no thread is selected
             if (layout.columns == 2 && !application.findChild("emptyStatePage") && !application.findChild("fakeItem")) {
-                layout.removePage(mainPage)
                 emptyStack()
                 showEmptyState()
             }