← Back to branch summary

~ubuntu-branches/ubuntu/vivid/messaging-app/vivid

« back to all changes in this revision

Viewing changes to src/qml/MMSDelegate.qml

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, CI Train Bot, Omer Akram, Tiago Salem Herrmann
  • Date: 2015-02-11 18:09:01 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20150211180901-w6c8jiwsvzl4ojyw
Tags: 0.1+15.04.20150211-0ubuntu1
https://launchpad.net/bugs/1418074
https://launchpad.net/bugs/1417353
[ CI Train Bot ]
* Resync trunk

[ Omer Akram ]
* Provide a pre-populated database for search test so that we don't
  conflict with the On Screen Display Notification (LP: #1418074)

[ Tiago Salem Herrmann ]
* Inject messages into the history service when it is impossible to
  send them. (LP: #1417353)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qml/MMSDelegate.qml
46
46
 
47
47
    function resendMessage()
48
48
    {
49
 
        if (!sendMessageSanityCheck()) {
50
 
            return
51
 
        }
52
 
 
 
49
        eventModel.removeEvents([messageData.properties]);
53
50
        var newAttachments = []
54
51
        for (var i = 0; i < attachments.length; i++) {
55
52
            var attachment = []
63
60
            attachment.push(item.filePath)
64
61
            newAttachments.push(attachment)
65
62
        }
66
 
        eventModel.removeEvents([messageData.properties]);
67
 
        // FIXME: export this information for MessageDelegate
68
 
        chatManager.sendMMS(participants, textMessage, newAttachments, messages.account.accountId)
 
63
        messages.sendMessage(textMessage, participants, newAttachments)
69
64
    }
70
65
 
71
66
    function copyMessage()