Merge lp:~tiagosh/messaging-app/fix-1373479 into lp:messaging-app

[Tiago Salem Herrmann]

Scroll new messages into view.

Scroll new messages into view.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

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

[lp:~tiagosh/messaging-app/fix-1373479]

283. By Tiago Salem Herrmann on 2015-01-05

remove pendingMessage logic as it is not useful anymore

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/498/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/653
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/651
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16813
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/367
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/367/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[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, infrastructure problems

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

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-12-09 17:46:14 +0000
+++ src/qml/Messages.qml	2015-01-05 19:47:32 +0000
@@ -50,7 +50,7 @@
     property alias contactWatcher: contactWatcherInternal
     property string lastFilter: ""
     property string text: ""
-    property bool pendingMessage: false
+    property string latestEventId: ""
 
     function addAttachmentsToModel(transfer) {
         for (var i = 0; i < transfer.items.length; i++) {
@@ -539,8 +539,14 @@
            sortOrder: HistorySort.DescendingOrder
         }
         onCountChanged: {
-            if (pendingMessage) {
-                pendingMessage = false
+            if (count == 0) {
+                latestEventId = ""
+                return
+            }
+            if (latestEventId == "") {
+                latestEventId = eventModel.get(0).eventId
+            } else if (latestEventId != eventModel.get(0).eventId) {
+                latestEventId = eventModel.get(0).eventId
                 messageList.positionViewAtBeginning()
             }
         }
@@ -904,14 +910,12 @@
                         attachment.push(item.filePath)
                         newAttachments.push(attachment)
                     }
-                    pendingMessage = true
                     chatManager.sendMMS(participants, textEntry.text, newAttachments, messages.account.accountId)
                     textEntry.text = ""
                     attachments.clear()
                     return
                 }
 
-                pendingMessage = true
                 chatManager.sendMessage(participants, textEntry.text, messages.account.accountId)
                 textEntry.text = ""
             }