Merge lp:~tiagosh/messaging-app/information-messageType into lp:messaging-app

[Tiago Salem Herrmann]

- Add initial support for the new information messageType.
- Notify users when the active sim card was switched.

- Add initial support for the new information messageType.
- Notify users when the active sim card was switched.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telephony-service/sim-lock/+merge/235505

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?
Yes

If you changed UI labels, did you update the pot file?
Will be done later.

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/472/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5160
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6412
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13707
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4075
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4075/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/473/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4977
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6502
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4131
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4131/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/474/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5292
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13888
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4145
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4145/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

130 + var fakeString = i18n.tr("You switched to %1")
139 + "You switched to %1")

This approach is not good, because if at any time we decide to change the displayed message, the existing events will lose the translation.

Maybe we can use a dynamic message and save a well known eventId or something like that to indicate the event is a SIM switch?

review: Needs Fixing

[Gustavo Pichorim Boiko (boiko)]

review: Needs Fixing

[Gustavo Pichorim Boiko (boiko)]

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 the 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/476/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5357
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5069
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6609
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13970
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4176/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

The last commit for scrolling into view is not working correctly.

- If the keyboard is visible and the list is scrolled all the way to the top, when you receive a new message it does scroll the list but the new message is only partially visible.

- Same with sending a message. If you are scrolled up and send a new message it's only partially visible. If you send a second message it will be fully visible.

Might be better to move this to a separate MR, just so we can land this?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/479/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5558
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6810
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6810/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4273
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4273/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/information-messageType]

262. By Tiago Salem Herrmann on 2014-10-07

disable highlightFollowsCurrentItem

263. By Tiago Salem Herrmann on 2014-10-07

update displayLabel on demand

264. By Tiago Salem Herrmann on 2014-10-07

revert scroll patch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:262
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/480/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5602/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3966
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/274
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5294/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4293
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4293/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

works now

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5616
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6868
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6868/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14286
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4302
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4302/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== added file 'src/qml/AccountSectionDelegate.qml'
--- src/qml/AccountSectionDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/qml/AccountSectionDelegate.qml	2014-10-07 16:50:23 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2012, 2013, 2014 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.2
+
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Contacts 0.1
+
+import "dateUtils.js" as DateUtils
+
+ListItemWithActions {
+    property var messageData: null
+    property int index: -1
+    property Item delegateItem
+    property string accountLabel: multipleAccounts ? telepathyHelper.accountForId(messageData.accountId).displayName : ""
+
+    height: sectionLabel.height + units.gu(2)
+    anchors.left: parent.left
+    anchors.right: parent.right
+    ListItem.ThinDivider {
+        id: leftDivider
+        anchors.verticalCenter: sectionLabel.verticalCenter
+        anchors.left: parent.left
+        anchors.right: sectionLabel.left
+        anchors.rightMargin: 0
+        anchors.leftMargin: 0
+    }
+
+    ListItem.ThinDivider {
+        id: rightDivider
+        anchors.verticalCenter: sectionLabel.verticalCenter
+        anchors.left: sectionLabel.right
+        anchors.right: parent.right
+        anchors.rightMargin: 0
+        anchors.leftMargin: 0
+    }
+
+    onItemClicked: {
+        if (root.isInSelectionMode) {
+            if (!root.selectItem(delegateItem)) {
+                root.deselectItem(delegateItem)
+            }
+        }
+    }
+
+    Label {
+        id: sectionLabel
+        anchors.horizontalCenter: parent.horizontalCenter
+        height: paintedHeight
+        clip: true
+        // TRANSLATORS: %1 is the SIM card name and %2 is the timestamp
+        text: i18n.tr("You switched to %1 @ %2")
+              .arg(accountLabel)
+              .arg(DateUtils.formatLogDate(messageData.timestamp))
+        fontSize: "x-small"
+        horizontalAlignment: Text.AlignHCenter
+    }
+}
+

=== modified file 'src/qml/MessageBubble.qml'
--- src/qml/MessageBubble.qml	2014-09-18 12:17:16 +0000
+++ src/qml/MessageBubble.qml	2014-10-07 16:50:23 +0000
@@ -130,7 +130,7 @@
                 return ""
 
             var str = Qt.formatTime(messageTimeStamp).toLowerCase()
-            if (root.accountName.length === 0) {
+            if (root.accountName.length === 0 || !root.messageIncoming) {
                 return str
             }
             str += " @ %1".arg(root.accountName)

=== modified file 'src/qml/MessageDateSection.qml'
--- src/qml/MessageDateSection.qml	2014-08-11 22:59:14 +0000
+++ src/qml/MessageDateSection.qml	2014-10-07 16:50:23 +0000
@@ -34,5 +34,7 @@
     }
     ListItem.ThinDivider {
         anchors.bottom: parent.bottom
+        anchors.rightMargin: 0
+        anchors.leftMargin: 0
     }
 }

=== modified file 'src/qml/MessageDelegateFactory.qml'
--- src/qml/MessageDelegateFactory.qml	2014-09-16 20:21:27 +0000
+++ src/qml/MessageDelegateFactory.qml	2014-10-07 16:50:23 +0000
@@ -76,7 +76,7 @@
         Binding {
             target: loader.item
             property: "messageData"
-            value: model
+            value: messageData
             when: (loader.status === Loader.Ready)
         }
         Binding {

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-09-17 15:48:56 +0000
+++ src/qml/Messages.qml	2014-10-07 16:50:23 +0000
@@ -857,12 +857,26 @@
                     participants = multiRecipient.recipients
                 }
                 // create the new thread and update the threadId list
-                eventModel.threadIdForParticipants(messages.account.accountId,
+                var threadId = eventModel.threadIdForParticipants(messages.account.accountId,
                                                    HistoryThreadModel.EventTypeText,
                                                    participants,
                                                    HistoryThreadModel.MatchPhoneNumber,
                                                    true)
-
+                for (var i=0; i < eventModel.count; i++) {
+                    var event = eventModel.get(i)
+                    if (event.senderId == "self" && event.accountId != messages.account.accountId) {
+                        // if the last outgoing message used a different accountId, add an
+                        // information event and quit the loop
+                        eventModel.writeTextInformationEvent(messages.account.accountId,
+                                                             threadId,
+                                                             participants,
+                                                             "")
+                        break;
+                    } else if (event.senderId == "self" && event.accountId == messages.account.accountId) {
+                        // in case last ougoing event used the same accountId, just skip
+                        break;
+                    }
+                }
                 updateFilters()
                 if (attachments.count > 0) {
                     var newAttachments = []

=== modified file 'src/qml/MessagesListView.qml'
--- src/qml/MessagesListView.qml	2014-09-16 20:21:27 +0000
+++ src/qml/MessagesListView.qml	2014-10-07 16:50:23 +0000
@@ -19,6 +19,7 @@
 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
 
@@ -92,69 +93,46 @@
         }
     ]
 
-    listDelegate: Column {
-        id: messageDelegate
-
-        // WORKAROUND: we can not use sections because the verticalLayoutDirection is ListView.BottomToTop the sections will appear
-        // bellow the item
-        MessageDateSection {
-            text: visible ? DateUtils.friendlyDay(timestamp) : ""
-            anchors {
-                left: parent.left
-                right: parent.right
-                leftMargin: units.gu(2)
-                rightMargin: units.gu(2)
-            }
-            visible: (index === root.count) || !DateUtils.areSameDay(eventModel.get(index+1).timestamp, timestamp)
-        }
-
-        MessageDelegateFactory {
-            objectName: "message%1".arg(index)
-
-            incoming: senderId != "self"
-            // TODO: we have several items inside
-            selected: root.isSelected(messageDelegate)
-            selectionMode: root.isInSelectionMode
-            accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
-            rightSideActions: {
-                var actions = []
-                if (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed) {
-                    actions.push(reloadAction)
-                }
-                actions.push(copyAction)
-                actions.push(infoAction)
-                return actions
-            }
-
-            // TODO: need select only the item
-            onItemClicked: {
-                if (root.isInSelectionMode) {
-                    if (!root.selectItem(messageDelegate)) {
-                        root.deselectItem(messageDelegate)
-                    }
-                }
-            }
-            onItemPressAndHold: {
-                root.startSelection()
-                root.selectItem(messageDelegate)
-            }
-            Component.onCompleted: {
-                if (newEvent) {
-                    messages.markMessageAsRead(accountId, threadId, eventId, type);
-                }
-            }
+    listDelegate: Loader {
+        id: loader
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: status == Loader.Ready ? item.height : 0
+        
+        Component.onCompleted: {
+            var properties = {"messageData": model}
+            var sourceFile = textMessageType == HistoryThreadModel.MessageTypeInformation ? "AccountSectionDelegate.qml" : "RegularMessageDelegate.qml"
+            loader.setSource(sourceFile, properties)
+        }
+
+        Binding {
+            target: loader.item
+            property: "index"
+            value: index
+            when: (loader.status === Loader.Ready)
+        }
+
+        Binding {
+            target: loader.item
+            property: "delegateItem"
+            value: loader
+            when: (loader.status === Loader.Ready)
         }
     }
 
     onSelectionDone: {
+        var removeDividers = (items.count == eventModel.count)
         for (var i=0; i < items.count; i++) {
             var event = items.get(i).model
+            if (!removeDividers && event.textMessageType == HistoryThreadModel.MessageTypeInformation) {
+                continue;
+            }
             eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
         }
     }
 
     onCountChanged: {
-        // list is in the bootom we should scroll to the new message
+        // list is in the bottom we should scroll to the new message
         if (Math.abs(height + contentY) < units.gu(3)) {
             currentIndex = 0
             positionViewAtBeginning()

=== added file 'src/qml/RegularMessageDelegate.qml'
--- src/qml/RegularMessageDelegate.qml	1970-01-01 00:00:00 +0000
+++ src/qml/RegularMessageDelegate.qml	2014-10-07 16:50:23 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012, 2013, 2014 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.2
+import Ubuntu.History 0.1
+import "dateUtils.js" as DateUtils
+
+Column {
+    height: childrenRect.height
+    property var messageData: null
+    property Item delegateItem
+    property var timestamp: messageData.timestamp
+    property string senderId: messageData.senderId
+    property var textReadTimestamp: messageData.textReadTimestamp
+    property int textMessageStatus: messageData.textMessageStatus
+    property var textMessageAttachments: messageData.textMessageAttachments
+    property bool newEvent: messageData.newEvent
+    property var textMessage: messageData.textMessage
+    property string accountId: messageData.accountId
+    property int index: -1
+
+    // WORKAROUND: we can not use sections because the verticalLayoutDirection is ListView.BottomToTop the sections will appear
+    // bellow the item
+    MessageDateSection {
+        text: visible ? DateUtils.friendlyDay(timestamp) : ""
+        anchors {
+            left: parent.left
+            right: parent.right
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+        }
+        visible: (index === root.count) || !DateUtils.areSameDay(eventModel.get(index+1).timestamp, timestamp)
+    }
+
+    MessageDelegateFactory {
+        objectName: "message%1".arg(index)
+
+        incoming: senderId != "self"
+        // TODO: we have several items inside
+        selected: root.isSelected(delegateItem)
+        selectionMode: root.isInSelectionMode
+        accountLabel: multipleAccounts ? telepathyHelper.accountForId(accountId).displayName : ""
+        rightSideActions: {
+            var actions = []
+            if (textMessageStatus === HistoryThreadModel.MessageStatusPermanentlyFailed) {
+                actions.push(reloadAction)
+            }
+            actions.push(copyAction)
+            actions.push(infoAction)
+            return actions
+        }
+
+        // TODO: need select only the item
+        onItemClicked: {
+            if (root.isInSelectionMode) {
+                if (!root.selectItem(delegateItem)) {
+                    root.deselectItem(delegateItem)
+                }
+            }
+        }
+        onItemPressAndHold: {
+            root.startSelection()
+            root.selectItem(delegateItem)
+        }
+        Component.onCompleted: {
+            if (newEvent) {
+                messages.markMessageAsRead(accountId, threadId, eventId, type);
+            }
+        }
+    }
+}