history-service

Merge lp://staging/~phablet-team/history-service/no_participants_on_threads into lp://staging/history-service/staging

  1. no_participants_on_threads
  2. Merge into staging
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 284
Merged at revision: 263
Proposed branch: lp://staging/~phablet-team/history-service/no_participants_on_threads
Merge into: lp://staging/history-service/staging
Prerequisite: lp://staging/~phablet-team/history-service/single_instance_using_lock_file
Diff against target: 1213 lines (+419/-172)
26 files modified
Ubuntu/History/historyeventmodel.cpp (+1/-1)
Ubuntu/History/historygroupedthreadsmodel.cpp (+54/-2)
Ubuntu/History/historygroupedthreadsmodel.h (+5/-0)
Ubuntu/History/historymodel.cpp (+14/-0)
Ubuntu/History/historymodel.h (+1/-0)
Ubuntu/History/historythreadmodel.cpp (+30/-9)
Ubuntu/History/historythreadmodel.h (+1/-0)
daemon/HistoryService.xml (+9/-0)
daemon/historydaemon.cpp (+119/-65)
daemon/historydaemon.h (+2/-0)
daemon/historyservicedbus.cpp (+6/-1)
daemon/historyservicedbus.h (+1/-0)
plugins/sqlite/sqlitehistoryplugin.cpp (+82/-52)
plugins/sqlite/sqlitehistoryplugin.h (+5/-5)
src/contactmatcher.cpp (+21/-8)
src/eventview.cpp (+1/-1)
src/manager.cpp (+14/-0)
src/manager.h (+1/-1)
src/managerdbus.cpp (+25/-0)
src/managerdbus_p.h (+1/-2)
src/plugin.h (+1/-0)
src/utils.cpp (+8/-4)
src/utils_p.h (+1/-0)
tests/daemon/DaemonTest.cpp (+0/-8)
tests/libhistoryservice/ManagerTest.cpp (+16/-11)
tests/plugins/sqlite/SqlitePluginTest.cpp (+0/-2)
To merge this branch: bzr merge lp://staging/~phablet-team/history-service/no_participants_on_threads
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
Review via email: mp+319376@code.staging.launchpad.net

Commit message

Do not load the participants from threads automatically. If the client really needs it, it can use the newly added API to fetch the participants.

Description of the change

Do not load the participants from threads automatically. If the client really needs it, it can use the newly added API to fetch the participants.

To post a comment you must log in.
lp://staging/~phablet-team/history-service/no_participants_on_threads updated
275. By Tiago Salem Herrmann

merge parent branch

276. By Tiago Salem Herrmann

merge parent branch

277. By Gustavo Pichorim Boiko

Deliver the threads with the participants filled for the threads we know will need it.

278. By Gustavo Pichorim Boiko

Cache the requests that didn't match any contact, and fix a wrong condition.

279. By Gustavo Pichorim Boiko

Merge parent

280. By Gustavo Pichorim Boiko

When extracting properties from text channels, avoid parsing participants when
there is no need for it.

281. By Gustavo Pichorim Boiko

Fix filtering of events emitted in signals.

282. By Tiago Salem Herrmann

Avoid duplicate join and leave events

283. By Gustavo Pichorim Boiko

Only mark threads as read if it has unread events.

284. By Gustavo Pichorim Boiko

Fix thread ack query

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

looks good to me.
thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: