Merge lp:~tiagosh/messaging-app/fix_leaks_and_empty_view into lp:messaging-app

[Tiago Salem Herrmann]

- Fix some memory leaks
- Use another approach to decide when to display the empty state view
- Avoid removing pages when resizing the AdaptivePageLayout

- Fix some memory leaks
- Use another approach to decide when to display the empty state view
- Avoid removing pages when resizing the AdaptivePageLayout

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:517
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/965/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6655/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6666/console

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix_leaks_and_empty_view]

518. By Tiago Salem Herrmann on 2016-02-26

fix qml test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/966/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6669/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6680/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[lp:~tiagosh/messaging-app/fix_leaks_and_empty_view]

519. By Tiago Salem Herrmann on 2016-03-10

avoid name collision

520. By Tiago Salem Herrmann on 2016-03-10

use a different name to avoid collision

521. By Tiago Salem Herrmann on 2016-03-10

reimplement findChild() to avoid test failure

522. By Tiago Salem Herrmann on 2016-03-15

destroy is asynchronous, so change the objectName

523. By Tiago Salem Herrmann on 2016-03-15

remove settings page from the stack

524. By Tiago Salem Herrmann on 2016-03-16

fix id of item

525. By Tiago Salem Herrmann on 2016-03-16

add 1ms delay to destroy

526. By Tiago Salem Herrmann on 2016-03-16

avoid redundant call

527. By Tiago Salem Herrmann on 2016-03-17

force destroy previewer views

528. By Tiago Salem Herrmann on 2016-03-17

merge trunk

529. By Tiago Salem Herrmann on 2016-03-17

only display 2 columns when width > units.gu(90)

=== modified file 'src/messagingapplication.cpp'
--- src/messagingapplication.cpp	2016-02-10 17:01:02 +0000
+++ src/messagingapplication.cpp	2016-03-17 21:07:09 +0000
@@ -315,3 +315,8 @@
     }
     g_object_unref(G_OBJECT(notification));
 }
+
+QObject *MessagingApplication::findMessagingChild(const QString &objectName)
+{
+    return m_view->rootObject()->findChild<QObject*>(objectName);
+}

=== modified file 'src/messagingapplication.h'
--- src/messagingapplication.h	2015-11-24 18:09:55 +0000
+++ src/messagingapplication.h	2016-03-17 21:07:09 +0000
@@ -44,6 +44,7 @@
     QString readTextFile(const QString &fileName);
     QString fileMimeType(const QString &fileName);
     void showNotificationMessage(const QString &message, const QString &icon = QString());
+    QObject *findMessagingChild(const QString &objectName);
 
 private Q_SLOTS:
     void setFullscreen(bool fullscreen);

=== 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-17 21:07:09 +0000
@@ -54,6 +54,17 @@
         title: previewerPage.title
         leadingActionBar {
             id: leadingBar
+            actions: [
+                Action {
+                    name: "cancel"
+                    text: i18n.tr("Cancel")
+                    iconName: "back"
+                    shortcut: "Esc"
+                    onTriggered: {
+                        mainStack.removePage(previewerPage)
+                    }
+                }
+            ]
         }
 
         trailingActionBar {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2016-02-23 15:07:46 +0000
+++ src/qml/Messages.qml	2016-03-17 21:07:09 +0000
@@ -68,7 +68,6 @@
                                            contactWatcher.isInteractive) ||
                                           contactWatcher.alias === "") ? contactWatcher.identifier : contactWatcher.alias
 
-
     // When using this view from the bottom edge, we are not in the stack, so we need to push on top of the parent page
     property var basePage: messages
 
@@ -732,12 +731,6 @@
         onTriggered: composeBar.addAttachments(sharedAttachmentsTransfer)
     }
 
-    Component.onDestruction: {
-        if (!mainView.dualPanel && !startedFromBottomEdge) {
-            mainPage.displayedThreadIndex = -1
-        }
-    }
-
     onReady: {
         isReady = true
         if (participants.length === 0 && keyboardFocus)
@@ -750,6 +743,17 @@
         }
     }
 
+    // These fake items are used to track if there are instances loaded
+    // on the second column because we have no access to the page stack
+    Loader {
+        sourceComponent: fakeItemComponent
+        active: !startedFromBottomEdge
+    }
+    Component {
+        id: fakeItemComponent
+        Item { objectName:"fakeItem"}
+    }
+
     Connections {
         target: telepathyHelper
         onSetupReady: {

=== modified file 'src/qml/MessagingBottomEdge.qml'
--- src/qml/MessagingBottomEdge.qml	2016-02-11 00:46:51 +0000
+++ src/qml/MessagingBottomEdge.qml	2016-03-17 21:07:09 +0000
@@ -5,6 +5,7 @@
     id: bottomEdge
 
     function commitWithProperties(properties) {
+        _realPage.destroy()
         _realPage = messagesComponent.createObject(null, properties)
         commit()
     }
@@ -27,7 +28,12 @@
         _realPage = messagesComponent.createObject(null)
     }
 
+    Component.onDestruction: {
+        _realPage.destroy()
+    }
+
     onCollapseCompleted: {
+        _realPage.destroy()
         _realPage = messagesComponent.createObject(null)
     }
 

=== modified file 'src/qml/MessagingPageLayout.qml'
--- src/qml/MessagingPageLayout.qml	2016-02-05 21:19:56 +0000
+++ src/qml/MessagingPageLayout.qml	2016-03-17 21:07:09 +0000
@@ -5,6 +5,19 @@
     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) {

=== modified file 'src/qml/SettingsPage.qml'
--- src/qml/SettingsPage.qml	2016-02-01 14:29:16 +0000
+++ src/qml/SettingsPage.qml	2016-03-17 21:07:09 +0000
@@ -30,6 +30,17 @@
         }
     ]
 
+    // These fake items are used to track if there are instances loaded
+    // on the second column because we have no access to the page stack
+    Loader {
+        sourceComponent: fakeItemComponent
+        active: true
+    }
+    Component {
+        id: fakeItemComponent
+        Item { objectName:"fakeItem"}
+    }
+
     GSettings {
         id: gsettings
         schema.id: "com.ubuntu.phone"
@@ -38,6 +49,23 @@
     header: PageHeader {
         id: pageHeader
         title: settingsPage.title
+        leadingActionBar {
+            actions: [
+                Action {
+                    id: singlePanelBackAction
+                    objectName: "back"
+                    name: "cancel"
+                    text: i18n.tr("Cancel")
+                    iconName: "back"
+                    shortcut: "Esc"
+                    visible: !mainView.dualPanel
+                    onTriggered: {
+                        // emptyStack will make sure the page gets removed.
+                        mainView.emptyStack()
+                    }
+                }
+            ]
+        }
     }
 
     Component {

=== modified file 'src/qml/messaging-app.qml'
--- src/qml/messaging-app.qml	2016-02-24 18:17:55 +0000
+++ src/qml/messaging-app.qml	2016-03-17 21:07:09 +0000
@@ -147,7 +147,7 @@
     }
 
     automaticOrientation: true
-    width: Screen.desktopAvailableWidth > units.gu(100) ? units.gu(100) : units.gu(40)
+    width: units.gu(90)
     height: units.gu(71)
     anchorToKeyboard: false
 
@@ -158,8 +158,6 @@
         // when running in windowed mode, do not allow resizing
         view.minimumWidth  = units.gu(40)
         view.minimumHeight = units.gu(60)
-
-        emptyStack()
     }
 
     Connections {
@@ -233,11 +231,12 @@
         mainStack.removePage(mainPage)
         layout.deleteInstances()
         showEmptyState()
+        mainPage.displayedThreadIndex = -1
     }
 
     function showEmptyState() {
-        if (mainStack.columns > 1) {
-            layout.addComponentToNextColumnSync(mainStack.primaryPage, emptyStatePageComponent)
+        if (mainStack.columns > 1 && !application.findMessagingChild("emptyStatePage")) {
+            layout.addComponentToNextColumnSync(mainPage, emptyStatePageComponent)
         }
     }
 
@@ -341,6 +340,19 @@
         id: emptyStatePageComponent
         Page {
             id: emptyStatePage
+            objectName: "emptyStatePage"
+            Connections {
+                target: layout
+                onColumnsChanged: {
+                    if (layout.columns == 1) {
+                        emptyStatePage.destroy(1)
+                        emptyStatePage.objectName = ""
+                        if (!application.findMessagingChild("fakeItem")) {
+                            layout.removePage(mainPage)
+                        }
+                    }
+                }
+            }
 
             EmptyState {
                 labelVisible: false
@@ -368,9 +380,14 @@
 
         onColumnsChanged: {
             // we only have things to do here in case no thread is selected
-            if (mainPage.displayedThreadIndex < 0) {
+            if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage") && !application.findMessagingChild("fakeItem")) {
                 layout.removePage(mainPage)
-                showEmptyState()
+                emptyStack()
+            }
+        }
+        Component.onCompleted: {
+            if (layout.columns == 2 && !application.findMessagingChild("emptyStatePage")) {
+                emptyStack()
             }
         }
     }

=== modified file 'tests/qml/tst_MessagesView.qml'
--- tests/qml/tst_MessagesView.qml	2016-01-22 16:27:34 +0000
+++ tests/qml/tst_MessagesView.qml	2016-03-17 21:07:09 +0000
@@ -71,6 +71,14 @@
         }
     }
 
+    Item {
+        id: application
+        function findMessagingChild(name)
+        {
+            return null
+        }
+    }
+
     QtObject {
         id: testAccount
         property string accountId: "ofono/ofono/account0"
@@ -119,6 +127,27 @@
 
         when: windowShown
 
+        // we reimplement the function here and add a special
+        // case to deal with a null child without failing
+        function findChild(obj,objectName) {
+            var childs = new Array(0);
+            childs.push(obj)
+            while (childs.length > 0) {
+                // this is the special case
+                if (!childs[0]) {
+                    childs.splice(0, 1);
+                }
+                if (childs[0].objectName == objectName) {
+                    return childs[0]
+                }
+                for (var i in childs[0].children) {
+                    childs.push(childs[0].children[i])
+                }
+                childs.splice(0, 1);
+            }
+            return null;
+        }
+
         function init() {
         }