1
=== modified file 'src/qml/MainPage.qml'
2
--- src/qml/MainPage.qml	2015-01-05 20:35:11 +0000
3
+++ src/qml/MainPage.qml	2015-01-23 15:31:27 +0000
4
@@ -43,6 +43,7 @@
5
43
43
6
44
    TextField {
44
    TextField {
7
45
        id: searchField
45
        id: searchField
8
46
        objectName: "searchField"
9
46
        visible: mainPage.searching
47
        visible: mainPage.searching
10
47
        anchors {
48
        anchors {
11
48
            left: parent.left
49
            left: parent.left
12
@@ -179,6 +180,7 @@
13
179
        }
180
        }
14
180
        listModel: threadModel
181
        listModel: threadModel
15
181
        clip: true
182
        clip: true
16
183
        cacheBuffer: threadList.height * 2
17
182
        section.property: "eventDate"
184
        section.property: "eventDate"
18
183
        //spacing: searchField.text === "" ? units.gu(-2) : 0
185
        //spacing: searchField.text === "" ? units.gu(-2) : 0
19
184
        section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
186
        section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
20
@@ -203,6 +205,9 @@
21
203
                } else {
205
                } else {
22
204
                    var properties = model.properties
206
                    var properties = model.properties
23
205
                    properties["keyboardFocus"] = false
207
                    properties["keyboardFocus"] = false
24
208
                    if (displayedEvent != null) {
25
209
                        properties["scrollToEventId"] = displayedEvent.eventId
26
210
                    }
27
206
                    if (model.participants[0].alias) {
211
                    if (model.participants[0].alias) {
28
207
                        properties["firstRecipientAlias"] = model.participants[0].alias;
212
                        properties["firstRecipientAlias"] = model.participants[0].alias;
29
208
                    }
213
                    }
30
209
214
31
=== modified file 'src/qml/Messages.qml'
32
--- src/qml/Messages.qml	2015-01-05 19:47:07 +0000
33
+++ src/qml/Messages.qml	2015-01-23 15:31:27 +0000
34
@@ -50,6 +50,8 @@
35
50
    property alias contactWatcher: contactWatcherInternal
50
    property alias contactWatcher: contactWatcherInternal
36
51
    property string lastFilter: ""
51
    property string lastFilter: ""
37
52
    property string text: ""
52
    property string text: ""
38
53
    property string scrollToEventId: ""
39
54
    property bool isSearching: scrollToEventId !== ""
40
53
    property string latestEventId: ""
55
    property string latestEventId: ""
41
54
56
42
55
    function addAttachmentsToModel(transfer) {
57
    function addAttachmentsToModel(transfer) {
43
@@ -109,6 +111,16 @@
44
109
        onAccountChanged: messages.account = mainView.account
111
        onAccountChanged: messages.account = mainView.account
45
110
    }
112
    }
46
111
113
47
114
    ActivityIndicator {
48
115
        id: activityIndicator
49
116
        anchors {
50
117
            verticalCenter: parent.verticalCenter
51
118
            horizontalCenter: parent.horizontalCenter
52
119
        }
53
120
        running: isSearching
54
121
        visible: running
55
122
    }
56
123
57
112
    ListModel {
124
    ListModel {
58
113
        id: attachments
125
        id: attachments
59
114
    }
126
    }
60
@@ -549,12 +561,47 @@
61
549
                latestEventId = eventModel.get(0).eventId
561
                latestEventId = eventModel.get(0).eventId
62
550
                messageList.positionViewAtBeginning()
562
                messageList.positionViewAtBeginning()
63
551
            }
563
            }
64
564
            if (isSearching) {
65
565
                // if we ask for more items manually listview will stop working,
66
566
                // so we only set again once the item was found
67
567
                messageList.listModel = null
68
568
                // always check last 15 items
69
569
                var maxItems = 15
70
570
                for (var i = count-1; count >= i; i--) {
71
571
                    if (--maxItems < 0) {
72
572
                        break;
73
573
                    }
74
574
                    if (eventModel.get(i).eventId == scrollToEventId) {
75
575
                        scrollToEventId = ""
76
576
                        messageList.listModel = eventModel
77
577
                        messageList.positionViewAtIndex(i, ListView.Center)
78
578
                        return;
79
579
                    }
80
580
                }
81
581
82
582
                if (eventModel.canFetchMore && isSearching) {
83
583
                    fetchMoreTimer.running = true
84
584
                } else {
85
585
                    // event not found
86
586
                    scrollToEventId = ""
87
587
                    messageList.listModel = eventModel
88
588
                }
89
589
            }
90
552
        }
590
        }
91
553
    }
591
    }
92
554
592
93
593
    Timer {
94
594
       id: fetchMoreTimer
95
595
       running: false
96
596
       interval: 100
97
597
       repeat: false
98
598
       onTriggered: eventModel.fetchMore()
99
599
    }
100
600
101
555
    MessagesListView {
601
    MessagesListView {
102
556
        id: messageList
602
        id: messageList
103
557
        objectName: "messageList"
603
        objectName: "messageList"
104
604
        visible: !isSearching
105
558
605
106
559
        // because of the header
606
        // because of the header
107
560
        clip: true
607
        clip: true
108
@@ -568,11 +615,11 @@
109
568
615
110
569
    Item {
616
    Item {
111
570
        id: bottomPanel
617
        id: bottomPanel
113
571
        anchors.bottom: keyboard.top
618
        anchors.bottom: isSearching ? parent.bottom : keyboard.top
114
572
        anchors.left: parent.left
619
        anchors.left: parent.left
115
573
        anchors.right: parent.right
620
        anchors.right: parent.right
116
574
        height: selectionMode ? 0 : textEntry.height + units.gu(2)
621
        height: selectionMode ? 0 : textEntry.height + units.gu(2)
118
575
        visible: !selectionMode
622
        visible: !selectionMode && !isSearching
119
576
        clip: true
623
        clip: true
120
577
        MouseArea {
624
        MouseArea {
121
578
            anchors.fill: parent
625
            anchors.fill: parent
122
579
626
123
=== modified file 'src/qml/ThreadDelegate.qml'
124
--- src/qml/ThreadDelegate.qml	2015-01-05 20:35:11 +0000
125
+++ src/qml/ThreadDelegate.qml	2015-01-23 15:31:27 +0000
126
@@ -22,6 +22,8 @@
127
22
import Ubuntu.Telephony 0.1
22
import Ubuntu.Telephony 0.1
128
23
import Ubuntu.Contacts 0.1
23
import Ubuntu.Contacts 0.1
129
24
import QtContacts 5.0
24
import QtContacts 5.0
130
25
import Ubuntu.History 0.1
131
26
import "dateUtils.js" as DateUtils
132
25
27
133
26
ListItemWithActions {
28
ListItemWithActions {
134
27
    id: delegate
29
    id: delegate
135
@@ -32,6 +34,10 @@
136
32
    property string phoneNumber: delegateHelper.phoneNumber
34
    property string phoneNumber: delegateHelper.phoneNumber
137
33
    property bool unknownContact: delegateHelper.isUnknown
35
    property bool unknownContact: delegateHelper.isUnknown
138
34
    property string threadId: model.threadId
36
    property string threadId: model.threadId
139
37
    property var displayedEvent: null
140
38
    property var displayedEventTextAttachments: displayedEvent ? displayedEvent.textMessageAttachments : eventTextAttachments
141
39
    property var displayedEventTimestamp: displayedEvent ? displayedEvent.timestamp : eventTimestamp
142
40
    property var displayedEventTextMessage: displayedEvent ? displayedEvent.textMessage : eventTextMessage
143
35
    property string groupChatLabel: {
41
    property string groupChatLabel: {
144
36
        var firstRecipient
42
        var firstRecipient
145
37
        if (unknownContact) {
43
        if (unknownContact) {
146
@@ -53,15 +59,15 @@
147
53
        var videoCount = 0
59
        var videoCount = 0
148
54
        var contactCount = 0
60
        var contactCount = 0
149
55
        var attachmentCount = 0
61
        var attachmentCount = 0
154
56
        for (var i = 0; i < eventTextAttachments.length; i++) {
62
        for (var i = 0; i < displayedEventTextAttachments.length; i++) {
155
57
            if (startsWith(eventTextAttachments[i].contentType, "text/plain")) {
63
            if (startsWith(displayedEventTextAttachments[i].contentType, "text/plain")) {
156
58
                return application.readTextFile(eventTextAttachments[i].filePath)
64
                return application.readTextFile(displayedEventTextAttachments[i].filePath)
157
59
            } else if (startsWith(eventTextAttachments[i].contentType, "image/")) {
65
            } else if (startsWith(displayedEventTextAttachments[i].contentType, "image/")) {
158
60
                imageCount++
66
                imageCount++
160
61
            } else if (startsWith(eventTextAttachments[i].contentType, "video/")) {
67
            } else if (startsWith(displayedEventTextAttachments[i].contentType, "video/")) {
161
62
                videoCount++
68
                videoCount++
164
63
            } else if (startsWith(eventTextAttachments[i].contentType, "text/vcard") ||
69
            } else if (startsWith(displayedEventTextAttachments[i].contentType, "text/vcard") ||
165
64
                      startsWith(eventTextAttachments[i].contentType, "text/x-vcard")) {
70
                      startsWith(displayedEventTextAttachments[i].contentType, "text/x-vcard")) {
166
65
                contactCount++
71
                contactCount++
167
66
            }
72
            }
168
67
        }
73
        }
169
@@ -79,26 +85,11 @@
170
79
        if (attachmentCount > 0) {
85
        if (attachmentCount > 0) {
171
80
            return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
86
            return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
172
81
        }
87
        }
174
82
        return eventTextMessage
88
        return displayedEventTextMessage
175
83
    }
89
    }
176
84
    anchors.left: parent.left
90
    anchors.left: parent.left
177
85
    anchors.right: parent.right
91
    anchors.right: parent.right
178
86
    height: units.gu(10)
92
    height: units.gu(10)
179
87
    // WORKAROUND: history-service can't filter by contact names
180
88
    onSearchTermChanged: {
181
89
        var found = false
182
90
        var searchTermLowerCase = searchTerm.toLowerCase()
183
91
        if (searchTerm !== "") {
184
92
            if ((delegateHelper.phoneNumber.toLowerCase().search(searchTermLowerCase) !== -1)
185
93
            || (!unknownContact && delegateHelper.alias.toLowerCase().search(searchTermLowerCase) !== -1)) {
186
94
                found = true
187
95
            }
188
96
        } else {
189
97
            found = true
190
98
        }
191
99
192
100
        height = found ? units.gu(8) : 0
193
101
    }
194
102
93
195
103
    leftSideAction: Action {
94
    leftSideAction: Action {
196
104
        iconName: "delete"
95
        iconName: "delete"
197
@@ -108,6 +99,12 @@
198
108
        }
99
        }
199
109
    }
100
    }
200
110
101
201
102
    Component.onCompleted: {
202
103
        if (searchTerm !== "") {
203
104
            delegateHelper.updateSearch()
204
105
        }
205
106
    }
206
107
207
111
    ContactAvatar {
108
    ContactAvatar {
208
112
        id: avatar
109
        id: avatar
209
113
110
210
@@ -151,7 +148,13 @@
211
151
            right: parent.right
148
            right: parent.right
212
152
        }
149
        }
213
153
150
215
154
        text: Qt.formatTime(eventTimestamp, Qt.DefaultLocaleShortDate)
151
        text: {
216
152
            if (!displayedEvent) {
217
153
                Qt.formatTime(displayedEventTimestamp, Qt.DefaultLocaleShortDate)
218
154
            } else {
219
155
                DateUtils.friendlyDay(Qt.formatDate(displayedEventTimestamp, "yyyy/MM/dd"))
220
156
            }
221
157
        }
222
155
        fontSize: "small"
158
        fontSize: "small"
223
156
    }
159
    }
224
157
160
225
@@ -215,6 +218,66 @@
226
215
        property alias contexts: phoneDetail.contexts
218
        property alias contexts: phoneDetail.contexts
227
216
        property bool isUnknown: contactId === ""
219
        property bool isUnknown: contactId === ""
228
217
        property string phoneNumberSubTypeLabel: ""
220
        property string phoneNumberSubTypeLabel: ""
229
221
        property var searchHistoryFilter: HistoryIntersectionFilter {
230
222
            HistoryFilter { filterProperty: "threadId"; filterValue: model.threadId }
231
223
            HistoryFilter { filterProperty: "accountId"; filterValue: model.accountId }
232
224
            HistoryFilter { filterProperty: "message"; filterValue: searchTerm; matchFlags: HistoryFilter.MatchContains }
233
225
        }
234
226
235
227
        function updateSearch() {
236
228
            var found = false
237
229
            var searchTermLowerCase = searchTerm.toLowerCase()
238
230
            if (searchTerm !== "") {
239
231
                if ((delegateHelper.phoneNumber.toLowerCase().search(searchTermLowerCase) !== -1)
240
232
                || (!unknownContact && delegateHelper.alias.toLowerCase().search(searchTermLowerCase) !== -1)) {
241
233
                    found = true
242
234
                } else {
243
235
                    searchEventModelLoader.active = true
244
236
                }
245
237
            } else {
246
238
                delegate.displayedEvent = null
247
239
                searchEventModelLoader.active = false
248
240
                found = true
249
241
            }
250
242
251
243
            delegate.height = found ? units.gu(8) : 0
252
244
        }
253
245
254
246
        // WORKAROUND: history-service can't filter by contact names
255
247
        Connections {
256
248
            target: delegate
257
249
            onSearchTermChanged: {
258
250
                delegateHelper.updateSearch()
259
251
            }
260
252
        }
261
253
262
254
        Loader {
263
255
            id: searchEventModelLoader
264
256
            active: false
265
257
            asynchronous: true
266
258
            sourceComponent: searchEventModelComponent
267
259
        }
268
260
269
261
        Component {
270
262
            id: searchEventModelComponent
271
263
            HistoryEventModel {
272
264
                id: eventModel
273
265
                type: HistoryThreadModel.EventTypeText
274
266
                filter: delegateHelper.searchHistoryFilter
275
267
                onCountChanged: {
276
268
                    if (count > 0) {
277
269
                        delegate.height = units.gu(8)
278
270
                        delegate.displayedEvent = eventModel.get(0)
279
271
                    } else if (searchTerm == "") {
280
272
                        delegate.height = units.gu(8)
281
273
                        delegate.displayedEvent = null
282
274
                    } else {
283
275
                        delegate.displayedEvent = null
284
276
                        delegate.height = 0
285
277
                    }
286
278
                }
287
279
            }
288
280
        }
289
218
281
290
219
        function updateSubTypeLabel() {
282
        function updateSubTypeLabel() {
291
220
            var subLabel = "";
283
            var subLabel = "";
292
221
284
293
=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
294
--- tests/autopilot/messaging_app/tests/test_messaging.py	2014-12-09 17:46:14 +0000
295
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-01-23 15:31:27 +0000
296
@@ -22,6 +22,8 @@
297
22
from messaging_app import helpers
22
from messaging_app import helpers
298
23
from messaging_app.tests import MessagingAppTestCase
23
from messaging_app.tests import MessagingAppTestCase
299
24
24
300
25
import ubuntuuitoolkit
301
26
302
25
27
303
26
class BaseMessagingTestCase(MessagingAppTestCase):
28
class BaseMessagingTestCase(MessagingAppTestCase):
304
27
29
305
@@ -298,6 +300,45 @@
306
298
        list_view = self.main_view.get_multiple_selection_list_view()
300
        list_view = self.main_view.get_multiple_selection_list_view()
307
299
        self.assertThat(list_view.count, Eventually(Equals(0)))
301
        self.assertThat(list_view.count, Eventually(Equals(0)))
308
300
302
309
303
    def test_search_for_message(self):
310
304
        def count_visible_threads(threads):
311
305
            count = 0
312
306
            for thread in threads:
313
307
                if thread.height != 0:
314
308
                    count += 1
315
309
            return count
316
310
317
311
        # populate history
318
312
        helpers.receive_sms('08151', 'Ubuntu')
319
313
        helpers.receive_sms('08152', 'Ubuntu1')
320
314
        helpers.receive_sms('08153', 'Ubuntu2')
321
315
        helpers.receive_sms('08154', 'Ubuntu22')
322
316
        helpers.receive_sms('08155', 'Ubuntu23')
323
317
324
318
        # verify that we got the messages
325
319
        self.assertThat(self.thread_list.count, Eventually(Equals(5)))
326
320
        threads = self.thread_list.select_many('ThreadDelegate')
327
321
328
322
        # tap search
329
323
        self.main_view.click_header_action('searchAction')
330
324
        text_field = self.main_view.select_single(
331
325
            ubuntuuitoolkit.TextField,
332
326
            objectName='searchField')
333
327
334
328
        text_field.write('Ubuntu2')
335
329
        self.assertThat(
336
330
            lambda: count_visible_threads(threads), Eventually(Equals(3)))
337
331
338
332
        text_field.clear()
339
333
        text_field.write('Ubuntu1')
340
334
        self.assertThat(
341
335
            lambda: count_visible_threads(threads), Eventually(Equals(1)))
342
336
343
337
        text_field.clear()
344
338
        text_field.write('Ubuntu')
345
339
        self.assertThat(
346
340
            lambda: count_visible_threads(threads), Eventually(Equals(5)))
347
341
348
301
342
349
302
class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
343
class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
350
303
344
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-01-08	Approve on 2015-01-23
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-01-21
Review via email: mp+245812@code.launchpad.net