messaging-app

Merge lp:~phablet-team/messaging-app/disable_contact_matching_dinamically into lp:messaging-app/staging

  1. disable_contact_matching_dinamically
  2. Merge into staging
Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 647
Merged at revision: 656
Proposed branch: lp:~phablet-team/messaging-app/disable_contact_matching_dinamically
Merge into: lp:messaging-app/staging
Prerequisite: lp:~phablet-team/messaging-app/close_channels_on_remove
Diff against target: 39 lines (+4/-4)
1 file modified
src/qml/Messages.qml (+4/-4)
To merge this branch: bzr merge lp:~phablet-team/messaging-app/disable_contact_matching_dinamically
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Review via email: mp+316378@code.launchpad.net

Commit message

Disable contact matching dynamically depending on the addressable fields.

Description of the change

Disable contact matching dynamically depending on the addressable fields.

To post a comment you must log in.
lp:~phablet-team/messaging-app/disable_contact_matching_dinamically updated
642. By Tiago Salem Herrmann

merge parent branch

643. By Tiago Salem Herrmann

merge parent branch

644. By Tiago Salem Herrmann

merge parent branch

645. By Renato Araujo Oliveira Filho

Parent merged.

646. By Tiago Salem Herrmann

merge parent branch

647. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/Messages.qml'
2--- src/qml/Messages.qml 2017-03-08 22:07:51 +0000
3+++ src/qml/Messages.qml 2017-03-08 22:07:52 +0000
4@@ -1099,7 +1099,7 @@
5 ContactWatcher {
6 id: typingContactWatcher
7 identifier: messages.userTypingId
8- addressableFields: messages.account ? messages.account.addressableVCardFields : ["tel"] // just to have a fallback there
9+ addressableFields: messages.account ? messages.account.addressableVCardFields : []
10 }
11
12 MessagesHeader {
13@@ -1252,7 +1252,7 @@
14 alias: firstParticipant ? firstParticipant.alias : ""
15 avatar: firstParticipant ? firstParticipant.avatar : ""
16 detailProperties: firstParticipant ? firstParticipant.detailProperties : {}
17- addressableFields: messages.account ? messages.account.addressableVCardFields : ["tel"] // just to have a fallback there
18+ addressableFields: messages.account ? messages.account.addressableVCardFields : []
19 }
20
21 HistoryUnionFilter {
22@@ -1269,7 +1269,7 @@
23 sort: HistorySort {}
24 groupingProperty: "participants"
25 filter: messages.accountId != "" && messages.threadId != "" ? filters : null
26- matchContacts: true
27+ matchContacts: messages.account.addressableVCardFields.length > 0
28 }
29
30 ListView {
31@@ -1297,7 +1297,7 @@
32 id: eventModel
33 type: HistoryThreadModel.EventTypeText
34 filter: updateFilters(telepathyHelper.textAccounts.all, messages.chatType, messages.participantIds, messages.reloadFilters, messages.threads)
35- matchContacts: true
36+ matchContacts: messages.account.addressableVCardFields.length > 0
37 sort: HistorySort {
38 sortField: "timestamp"
39 sortOrder: HistorySort.DescendingOrder

Subscribers

People subscribed via source and target branches

to all changes: