history-service

Merge lp://staging/history-service/staging into lp://staging/history-service

  1. staging
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 252
Merged at revision: 233
Proposed branch: lp://staging/history-service/staging
Merge into: lp://staging/history-service
Diff against target: 4547 lines (+2269/-272)
62 files modified
CMakeLists.txt (+1/-0)
Ubuntu/History/historyeventmodel.cpp (+17/-0)
Ubuntu/History/historyeventmodel.h (+2/-0)
Ubuntu/History/historymodel.cpp (+144/-24)
Ubuntu/History/historymodel.h (+48/-2)
Ubuntu/History/historythreadmodel.cpp (+9/-1)
Ubuntu/History/historythreadmodel.h (+3/-1)
daemon/CMakeLists.txt (+1/-0)
daemon/HistoryService.xml (+14/-0)
daemon/historydaemon.cpp (+613/-55)
daemon/historydaemon.h (+28/-9)
daemon/historyservicedbus.cpp (+25/-17)
daemon/historyservicedbus.h (+6/-1)
daemon/rolesinterface.cpp (+71/-0)
daemon/rolesinterface.h (+210/-0)
daemon/textchannelobserver.cpp (+3/-1)
daemon/textchannelobserver.h (+2/-1)
plugins/sqlite/schema/v13.sql (+44/-0)
plugins/sqlite/schema/v14.sql (+82/-0)
plugins/sqlite/schema/v15.sql (+1/-0)
plugins/sqlite/schema/v16.sql (+2/-0)
plugins/sqlite/schema/v17.sql (+2/-0)
plugins/sqlite/sqlitedatabase.cpp (+55/-1)
plugins/sqlite/sqlitedatabase.h (+1/-0)
plugins/sqlite/sqlitehistoryplugin.cpp (+478/-44)
plugins/sqlite/sqlitehistoryplugin.h (+10/-1)
plugins/sqlite/sqlitehistorythreadview.cpp (+0/-5)
src/channelobserver.cpp (+2/-1)
src/contactmatcher.cpp (+13/-3)
src/contactmatcher_p.h (+2/-2)
src/manager.cpp (+18/-2)
src/manager.h (+7/-1)
src/managerdbus.cpp (+14/-2)
src/managerdbus_p.h (+7/-1)
src/participant.cpp (+48/-6)
src/participant.h (+7/-2)
src/participant_p.h (+4/-0)
src/plugin.h (+9/-1)
src/plugineventview.cpp (+0/-1)
src/pluginthreadview.cpp (+0/-1)
src/textevent.cpp (+13/-3)
src/textevent.h (+2/-0)
src/textevent_p.h (+2/-0)
src/thread.cpp (+48/-14)
src/thread.h (+8/-2)
src/thread_p.h (+8/-2)
src/types.h (+67/-1)
src/utils.cpp (+28/-3)
src/utils_p.h (+4/-2)
tests/Ubuntu.History/HistoryEventModelTest.cpp (+1/-0)
tests/Ubuntu.History/HistoryGroupedThreadsModelTest.cpp (+1/-1)
tests/common/mock/CMakeLists.txt (+1/-1)
tests/common/mock/callchannel.cpp (+2/-1)
tests/common/mock/mockconnectiondbus.cpp (+5/-6)
tests/common/mock/textchannel.cpp (+6/-4)
tests/common/mock/textchannel.h (+1/-1)
tests/daemon/CMakeLists.txt (+4/-4)
tests/daemon/DaemonTest.cpp (+2/-2)
tests/libhistoryservice/ParticipantTest.cpp (+18/-4)
tests/libhistoryservice/TextEventTest.cpp (+26/-17)
tests/libhistoryservice/ThreadTest.cpp (+4/-2)
tests/plugins/sqlite/SqlitePluginTest.cpp (+15/-16)
To merge this branch: bzr merge lp://staging/history-service/staging
Reviewer Review Type Date Requested Status
Roberto Mier Escandon (community) Approve
Tiago Salem Herrmann (community) Approve
Review via email: mp+308933@code.staging.launchpad.net

Commit message

Improve group chat support.

Description of the change

Improve group chat support.

To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

Left some comments

review: Needs Fixing
lp://staging/history-service/staging updated
241. By Gustavo Pichorim Boiko

Re-enable DaemonTests.

242. By Gustavo Pichorim Boiko

Adapt the registration of objects and services to the way QtDBus works from 5.6.x on.

243. By Gustavo Pichorim Boiko

Skip self join notification in conversation when account is a ofono one

244. By Gustavo Pichorim Boiko

Fix tests on latest tp-qt.

245. By Gustavo Pichorim Boiko

Leave the mock call channel opened for a bit longer to make sure the last state change propagates correctly.

246. By Gustavo Pichorim Boiko

Allow applications to insert different kind of information events.

247. By Gustavo Pichorim Boiko

Update existing chats to Room or None based on the MMS option in Accounts Service.

248. By Gustavo Pichorim Boiko

- Create hash for threadId of broadcast messages
- Avoid grouping chats with different chatType's

249. By Gustavo Pichorim Boiko

- Fix broken tests with latest changes.
- Set ChatType correctly when using createThreadForParticipants()

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

just two more fixes.

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

Debug prints removed, question answered and loops changed on a separate MR.

lp://staging/history-service/staging updated
250. By Gustavo Pichorim Boiko

Remove debug prints.

251. By Gustavo Pichorim Boiko

Use compareIds()

252. By Gustavo Pichorim Boiko

Use a more complete time format to generate the hash.

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

Looks good to me. thank you!

review: Approve
lp://staging/history-service/staging updated
253. By Gustavo Pichorim Boiko

Simplify the filtering of participants.

Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

lgtm

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: