lp://qastaging/history-service/staging

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Approved for merging into lp://qastaging/history-service

Gustavo Pichorim Boiko (community): Approve on 2017-03-23

system-apps-ci-bot: Approve (continuous-integration) on 2017-03-23

Diff: 3363 lines (+1270/-447)

49 files modified

CMakeLists.txt (+5/-0)
Ubuntu/History/historyeventmodel.cpp (+39/-42)
Ubuntu/History/historyeventmodel.h (+2/-5)
Ubuntu/History/historygroupedthreadsmodel.cpp (+54/-2)
Ubuntu/History/historygroupedthreadsmodel.h (+5/-0)
Ubuntu/History/historymodel.cpp (+106/-10)
Ubuntu/History/historymodel.h (+11/-0)
Ubuntu/History/historythreadmodel.cpp (+48/-9)
Ubuntu/History/historythreadmodel.h (+2/-0)
cmake/modules/GenerateTest.cmake (+1/-0)
daemon/HistoryService.xml (+29/-0)
daemon/callchannelobserver.cpp (+16/-2)
daemon/callchannelobserver.h (+2/-1)
daemon/historydaemon.cpp (+323/-186)
daemon/historydaemon.h (+21/-10)
daemon/historyservicedbus.cpp (+102/-8)
daemon/historyservicedbus.h (+25/-0)
daemon/main.cpp (+15/-5)
daemon/textchannelobserver.cpp (+1/-14)
daemon/textchannelobserver.h (+1/-2)
plugins/sqlite/schema/v18.sql (+14/-0)
plugins/sqlite/sqlitedatabase.cpp (+10/-0)
plugins/sqlite/sqlitehistoryeventview.cpp (+8/-1)
plugins/sqlite/sqlitehistoryplugin.cpp (+136/-53)
plugins/sqlite/sqlitehistoryplugin.h (+6/-1)
plugins/sqlite/sqlitehistorythreadview.cpp (+8/-1)
src/contactmatcher.cpp (+57/-22)
src/contactmatcher_p.h (+2/-0)
src/eventview.cpp (+6/-2)
src/eventview.h (+3/-1)
src/manager.cpp (+24/-0)
src/manager.h (+4/-1)
src/managerdbus.cpp (+56/-10)
src/managerdbus_p.h (+10/-2)
src/participant.cpp (+9/-0)
src/participant.h (+1/-0)
src/plugin.h (+6/-0)
src/thread.cpp (+16/-0)
src/thread.h (+2/-0)
src/threadview.cpp (+15/-0)
src/threadview.h (+8/-0)
src/threadview_p.h (+4/-0)
src/utils.cpp (+16/-1)
src/utils_p.h (+2/-0)
tests/Ubuntu.History/HistoryEventModelTest.cpp (+1/-1)
tests/daemon/DaemonTest.cpp (+0/-8)
tests/libhistoryservice/ManagerTest.cpp (+16/-43)
tests/plugins/sqlite/SqliteEventViewTest.cpp (+22/-2)
tests/plugins/sqlite/SqlitePluginTest.cpp (+0/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

265. By Gustavo Pichorim Boiko on 2017-03-23

Fix return value of a function that is now asynchronous

Merged branch lp://qastaging/~phablet-team/history-service/fix_async_call

264. By Gustavo Pichorim Boiko on 2017-03-22

Make it possible to debug sqlite commands.

Merged branch lp://qastaging/~phablet-team/history-service/trace_sqlite

263. By Gustavo Pichorim Boiko on 2017-03-22

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.

Merged branch lp://qastaging/~phablet-team/history-service/no_participants_on_threads

262. By Gustavo Pichorim Boiko on 2017-03-22

Use a QLockFile to ensure there will be only one instance of the daemon per user.
As we now delay the registration on dbus, sometimes we ended up having two instances of the daeon running (because of dbus activation). This change makes sure that won't happen.

Merged branch lp://qastaging/~phablet-team/history-service/single_instance_using_lock_file

261. By Gustavo Pichorim Boiko on 2017-03-22

Reduce the dbus traffic when marking messages and threads as read.

Merged branch lp://qastaging/~phablet-team/history-service/optimize_dbus_traffic

260. By Gustavo Pichorim Boiko on 2017-03-22

Allow pass multiple fields on sort clause.

Merged branch lp://qastaging/~phablet-team/history-service/sort_by_multiple_fields

259. By Gustavo Pichorim Boiko on 2017-03-22

Mark entire conversations as read.

Merged branch lp://qastaging/~phablet-team/history-service/mark_threads_as_read

258. By Gustavo Pichorim Boiko on 2017-03-22

Improve Roles management performance by caching the retrieved data.

Merged branch lp://qastaging/~phablet-team/history-service/improve_roles_management

257. By Gustavo Pichorim Boiko on 2017-03-22

Only start saving information events about contacts joining and leaving after the self contact is in the local list of participants.

Merged branch lp://qastaging/~phablet-team/history-service/wait_for_self_not_pending

256. By Gustavo Pichorim Boiko on 2017-03-22

Improve the notifications of participants changing

Merged branch lp://qastaging/~phablet-team/history-service/improve_participant_changes_notification