messaging-app

src/qml/MMS/Previewer.qml (+47/-0)
src/qml/MainPage.qml (+3/-24)
src/qml/MessageBubble.qml (+1/-1)
src/qml/Messages.qml (+23/-2)
src/qml/MessagesListView.qml (+2/-0)
src/qml/ThreadDelegate.qml (+2/-0)
src/qml/messaging-app.qml (+39/-50)

To merge this branch:

bzr merge lp:~tiagosh/messaging-app/improve_startup_time

Related bugs:

Bug #1325001: [performance] improve app startup time	Critical	Fix Released
Bug #1356539: scrolling in thread view with pictures very slow	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)			Approve on 2014-09-05
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-04
Bill Filler (community)		2014-08-29	Needs Fixing on 2014-09-04
Review via email: mp+232770@code.launchpad.net

Commit message

Improve startup time

Description of the change

Improve startup time

--Checklist--

Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~renatofilho/messaging-app/use-contactlistmodel/+merge/231017

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29:

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

review: Needs Fixing (continuous-integration)

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-01

210. By Tiago Salem Herrmann on 2014-09-01: fix focus on first run

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-01:

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/432/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5552
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3525
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3525/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-02

211. By Tiago Salem Herrmann on 2014-09-02: reenable dynamicsortfilter

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-02:

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5589
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5589/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3543/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-02

212. By Tiago Salem Herrmann on 2014-09-02: avoid calling threadForParticipants() more than once

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-02:

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

review: Needs Fixing (continuous-integration)

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-03

213. By Tiago Salem Herrmann on 2014-09-03: improve a bit more startup

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-03:

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/440/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12582
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3596
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3596/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-04:

Seems better but noticing a few issues:
1) The first time I load a conversation that has lots of sent messages at the end, I see the green bubbles paint initially without the arrow on the right but instead it shows an ugly black square that eventually turns into the arrow on the right of the bubble. This is definitely a new issue either with this MR or something in silo 3

2) From the main chat view, select a conversation to open from a contact. When the thread view is opened, instead of showing the contact name in the header it shows the phone number (and Add Contact button on right) for at least 1 second before switching to show the contact name and proper contact icon. This delay is much longer then it used to be. We should show the contact name immediately when showing the view, as we already know it because we selected it from the previous chats page and shouldn't have to first show the number then switch.

review: Needs Fixing

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-04

214. By Tiago Salem Herrmann on 2014-09-04: avoid displaying a black square.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

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

review: Needs Fixing (continuous-integration)

lp:~tiagosh/messaging-app/improve_startup_time updated on 2014-09-04

215. By Tiago Salem Herrmann on 2014-09-04: reuse ContactWatcher instance

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-09-05:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to this MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Sam Short

Tiago Salem Herrmann

Ubuntu Phablet Team

 === modified file 'src/qml/MMS/Previewer.qml'
 --- src/qml/MMS/Previewer.qml	2014-08-11 22:59:14 +0000
 +++ src/qml/MMS/Previewer.qml	2014-09-04 03:08:58 +0000
@@ -50,4 +50,51 @@
+             }
+         }
+     }
++
++    Component {
++        id: resultComponent
++        ContentItem {}
++    }
++
++    Page {
++        id: picker
++        visible: false
++        property var curTransfer
++        property var url
++        property var handler
++        property var contentType: getContentType(url)
++
++        function __exportItems(url) {
++            if (picker.curTransfer.state === ContentTransfer.InProgress)
++            {
++                picker.curTransfer.items = [ resultComponent.createObject(mainView, {"url": url}) ];
++                picker.curTransfer.state = ContentTransfer.Charged;
++            }
++        }
++
++        ContentPeerPicker {
++            visible: parent.visible
++            contentType: picker.contentType
++            handler: picker.handler
++
++            onPeerSelected: {
++                picker.curTransfer = peer.request();
++                mainStack.pop();
++                if (picker.curTransfer.state === ContentTransfer.InProgress)
++                    picker.__exportItems(picker.url);
++            }
++            onCancelPressed: mainStack.pop();
++        }
++
++        Connections {
++            target: picker.curTransfer !== null ? picker.curTransfer : null
++            onStateChanged: {
++                console.log("curTransfer StateChanged: " + picker.curTransfer.state);
++                if (picker.curTransfer.state === ContentTransfer.InProgress)
++                {
++                    picker.__exportItems(picker.url);
++                }
++            }
++        }
++    }
+ }
 === modified file 'src/qml/MainPage.qml'
 --- src/qml/MainPage.qml	2014-08-28 05:31:01 +0000
 +++ src/qml/MainPage.qml	2014-09-04 03:08:58 +0000
@@ -19,8 +19,8 @@
  import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
++import Ubuntu.Contacts 0.1
  import Ubuntu.History 0.1
--import Ubuntu.Contacts 0.1
  import "dateUtils.js" as DateUtils
  LocalPageWithBottomEdge {
@@ -37,10 +37,8 @@
      title: selectionMode ? " " : i18n.tr("Chats")
      bottomEdgeEnabled: !selectionMode && !searching
--    bottomEdgePageComponent: Messages {
--        active: false
--    }
      bottomEdgeTitle: i18n.tr("Create new")
++    bottomEdgePageComponent: Messages { active: false }
      TextField {
          id: searchField
@@ -146,25 +144,6 @@
+         }
+     }
--    HistoryThreadGroupingProxyModel {
--        id: sortProxy
--        sortRole: HistoryThreadModel.LastEventTimestampRole
--        sourceModel: threadModel
--        ascending: false
--        groupingProperty: "participants"
--    }
--
--    HistoryThreadModel {
--        id: threadModel
--        type: HistoryThreadModel.EventTypeText
--        sort: HistorySort {
--            sortField: "lastEventTimestamp"
--            sortOrder: HistorySort.DescendingOrder
--        }
--        filter: HistoryFilter {
--        }
--    }
--
      Component {
          id: sectionDelegate
          Item {
@@ -223,6 +202,7 @@
                      properties["accountId"] = accountId
                      properties["participants"] = participants
                      properties["keyboardFocus"] = false
++                    properties["contactWatcher"] = contactWatcher
                      mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
+                 }
+             }
@@ -239,7 +219,6 @@
+                 }
+             }
+         }
--
+     }
      KeyboardRectangle {
 === modified file 'src/qml/MessageBubble.qml'
 --- src/qml/MessageBubble.qml	2014-08-28 21:58:57 +0000
 +++ src/qml/MessageBubble.qml	2014-09-04 03:08:58 +0000
@@ -140,7 +140,7 @@
          source: Qt.resolvedUrl("./assets/conversation_bubble_arrow.png")
          color: root.color
--        asynchronous: true
++        asynchronous: false
          anchors {
              bottom: parent.bottom
              bottomMargin: units.gu(2)
 === modified file 'src/qml/Messages.qml'
 --- src/qml/Messages.qml	2014-09-04 03:08:58 +0000
 +++ src/qml/Messages.qml	2014-09-04 03:08:58 +0000
@@ -37,6 +37,7 @@
      property QtObject account: mainView.account
      property variant participants: []
++    property variant previousParticipants: []
      property bool groupChat: participants.length > 1
      property bool keyboardFocus: true
      property alias selectionMode: messageList.isInSelectionMode
@@ -46,9 +47,18 @@
      property var activeTransfer: null
      property int activeAttachmentIndex: -1
      property var sharedAttachmentsTransfer: []
++    property QtObject contactWatcher: contactWatcherInternal
      property string lastFilter: ""
      property string text: ""
++    onContactWatcherChanged: {
++        if (!contactWatcher) {
++            // use the internal contactWatcher if the previous instance
++            // was deleted
++            contactWatcher = contactWatcherInternal
++        }
++    }
++
      function addAttachmentsToModel(transfer) {
          for (var i = 0; i < transfer.items.length; i++) {
              var attachment = {}
@@ -149,6 +159,9 @@
              eventModel.filter = null
              return
+         }
++        if (previousParticipants.join('') === participants.join('')) {
++            return
++        }
          var componentUnion = "import Ubuntu.History 0.1; HistoryUnionFilter { %1 }"
          var componentFilters = ""
          for (var i in telepathyHelper.accountIds) {
@@ -170,6 +183,7 @@
              var finalString = componentUnion.arg(componentFilters)
              eventModel.filter = Qt.createQmlObject(finalString, eventModel)
              lastFilter = componentFilters
++            previousParticipants = participants
+         }
+     }
@@ -339,8 +353,15 @@
+     }
      ContactWatcher {
--        id: contactWatcher
--        phoneNumber: participants.length > 0 ? participants[0] : ""
++        id: contactWatcherInternal
++        phoneNumber: {
++            if (contactWatcher != contactWatcherInternal || participants.length === 0) {
++                // dont update if we are using another contact watcher or the list
++                // of participants is empty
++                return ""
++            }
++            return participants[0]
++        }
+     }
      onParticipantsChanged: {
 === modified file 'src/qml/MessagesListView.qml'
 --- src/qml/MessagesListView.qml	2014-08-25 19:56:17 +0000
 +++ src/qml/MessagesListView.qml	2014-09-04 03:08:58 +0000
@@ -55,6 +55,8 @@
      listModel: participants.length > 0 ? sortProxy : null
      verticalLayoutDirection: ListView.BottomToTop
      highlightFollowsCurrentItem: true
++    // this is to keep the scrolling smooth
++    cacheBuffer: units.gu(10)*20
      currentIndex: 0
      _availableActions: [
          Action {
 === modified file 'src/qml/ThreadDelegate.qml'
 --- src/qml/ThreadDelegate.qml	2014-08-28 05:28:58 +0000
 +++ src/qml/ThreadDelegate.qml	2014-09-04 03:08:58 +0000
@@ -31,6 +31,7 @@
      property string phoneNumber: delegateHelper.phoneNumber
      property bool unknownContact: delegateHelper.isUnknown
      property string threadId: model.threadId
++    property QtObject contactWatcher: delegateHelper.contactWatcher
      property string groupChatLabel: {
          var firstRecipient
          if (unknownContact) {
@@ -222,6 +223,7 @@
          property alias subTypes: phoneDetail.subTypes
          property alias contexts: phoneDetail.contexts
          property alias isUnknown: watcherInternal.isUnknown
++        property QtObject contactWatcher: watcherInternal
          property string phoneNumberSubTypeLabel: ""
          function updateSubTypeLabel() {
 === modified file 'src/qml/messaging-app.qml'
 --- src/qml/messaging-app.qml	2014-08-19 19:43:39 +0000
 +++ src/qml/messaging-app.qml	2014-09-04 03:08:58 +0000
@@ -19,10 +19,10 @@
  import QtQuick 2.2
  import Qt.labs.settings 1.0
  import Ubuntu.Components 1.1
--import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Components.Popups 0.1
  import Ubuntu.Telephony 0.1
  import Ubuntu.Content 0.1
++import Ubuntu.History 0.1
  MainView {
      id: mainView
@@ -65,7 +65,6 @@
      Component.onCompleted: {
          i18n.domain = "messaging-app"
          i18n.bindtextdomain("messaging-app", i18nDirectory)
--        mainStack.push(Qt.resolvedUrl("MainPage.qml"))
+     }
      Connections {
@@ -78,6 +77,42 @@
+         }
+     }
++    HistoryThreadModel {
++        id: threadModel
++        type: HistoryThreadModel.EventTypeText
++        sort: HistorySort {
++            sortField: "lastEventTimestamp"
++            sortOrder: HistorySort.DescendingOrder
++        }
++        filter: HistoryFilter {}
++    }
++
++    // the model depends on dbus calls, so we instantiate it as earlier as possible
++    // to improve a bit the startup time
++    HistoryThreadGroupingProxyModel {
++        id: sortProxy
++        sortRole: HistoryThreadModel.LastEventTimestampRole
++        sourceModel: threadModel
++        ascending: false
++        groupingProperty: "participants"
++        // WORKAROUND: remove this once the sort model is replaced by something else.
++        // the dynamicSortFilter during startup causes bindings
++        // to be re-evaluated multiple times
++        dynamicSortFilter: false
++        onCountChanged: {
++            if (count > 0) {
++                timer.start()
++            }
++        }
++    }
++
++    Timer {
++        id: timer
++        repeat: false
++        interval: 10
++        onTriggered: sortProxy.dynamicSortFilter = true
++    }
++
      Settings {
          id: settings
          category: "DualSim"
@@ -85,11 +120,6 @@
          property int mainViewDontAskCount: 0
+     }
--    Component {
--        id: resultComponent
--        ContentItem {}
--    }
--
      Connections {
          target: ContentHub
          onShareRequested: {
@@ -100,48 +130,6 @@
+         }
+     }
--    Page {
--        id: picker
--        visible: false
--        property var curTransfer
--        property var url
--        property var handler
--        property var contentType: getContentType(url)
--
--        function __exportItems(url) {
--            if (picker.curTransfer.state === ContentTransfer.InProgress)
--            {
--                picker.curTransfer.items = [ resultComponent.createObject(mainView, {"url": url}) ];
--                picker.curTransfer.state = ContentTransfer.Charged;
--            }
--        }
--
--        ContentPeerPicker {
--            visible: parent.visible
--            contentType: picker.contentType
--            handler: picker.handler
--
--            onPeerSelected: {
--                picker.curTransfer = peer.request();
--                mainStack.pop();
--                if (picker.curTransfer.state === ContentTransfer.InProgress)
--                    picker.__exportItems(picker.url);
--            }
--            onCancelPressed: mainStack.pop();
--        }
--
--        Connections {
--            target: picker.curTransfer !== null ? picker.curTransfer : null
--            onStateChanged: {
--                console.log("curTransfer StateChanged: " + picker.curTransfer.state);
--                if (picker.curTransfer.state === ContentTransfer.InProgress)
--                {
--                    picker.__exportItems(picker.url);
--                }
--            }
--        }
--    }
--
      signal applicationReady
      function startsWith(string, prefix) {
@@ -168,7 +156,7 @@
      function startNewMessage() {
          var properties = {}
          emptyStack()
--        mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
++        mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
+     }
      function startChat(phoneNumber) {
@@ -196,5 +184,6 @@
          id: mainStack
          objectName: "mainStack"
++        Component.onCompleted: mainStack.push(Qt.resolvedUrl("MainPage.qml"))
+     }
+ }