Merge lp://staging/~tiagosh/history-service/cached-conversations into lp://staging/history-service

Proposed by Tiago Salem Herrmann
Status: Superseded
Proposed branch: lp://staging/~tiagosh/history-service/cached-conversations
Merge into: lp://staging/history-service
Prerequisite: lp://staging/~boiko/history-service/store_normalized_phone_numbers
Diff against target: 519 lines (+240/-14)
12 files modified
Ubuntu/History/historythreadmodel.cpp (+14/-0)
Ubuntu/History/historythreadmodel.h (+1/-0)
debian/rules (+1/-1)
historyprivate/contactmatcher.cpp (+9/-5)
historyprivate/utils.cpp (+59/-0)
historyprivate/utils_p.h (+2/-0)
plugins/sqlite/sqlitehistoryplugin.cpp (+123/-1)
plugins/sqlite/sqlitehistoryplugin.h (+6/-0)
src/thread.cpp (+18/-5)
src/thread.h (+3/-1)
src/thread_p.h (+3/-1)
src/types.h (+1/-0)
To merge this branch: bzr merge lp://staging/~tiagosh/history-service/cached-conversations
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+271534@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-09-17.

Commit message

Initial cache implementation for grouped conversations.

Description of the change

Initial cache implementation for grouped conversations.

To post a comment you must log in.
212. By Tiago Salem Herrmann

Use descending order to create the cache

213. By Tiago Salem Herrmann

Add groupedThreads property to model/views

214. By Tiago Salem Herrmann

add shouldGroupAccount()

215. By Tiago Salem Herrmann

Avoid property name collision

216. By Tiago Salem Herrmann

Pass a qvariantmap instead of a bool to be more flexible

217. By Tiago Salem Herrmann

Use matchFlags to determine grouping

218. By Tiago Salem Herrmann

Use matchFlags to decide if phone comparison is needed

219. By Tiago Salem Herrmann

move code that fills cache to a separate method

220. By Tiago Salem Herrmann

reenable tests

221. By Tiago Salem Herrmann

Return Thread object instead of QVariantMap

222. By Tiago Salem Herrmann

Make getSingleThread return grouped threads as well

223. By Tiago Salem Herrmann

update historythreadmodel to the new groupedThreads property

224. By Tiago Salem Herrmann

convert to properties before sending to dbus

225. By Tiago Salem Herrmann

initial refactor of the model to use cache from service side

226. By Tiago Salem Herrmann

also fill map with last event properties

227. By Tiago Salem Herrmann

Update cache and displayed thread

228. By Tiago Salem Herrmann

try dbus cast and then normal demarshling

229. By Tiago Salem Herrmann

use the same schema as participants

230. By Tiago Salem Herrmann

use the right property

231. By Tiago Salem Herrmann

remove debugs
update cache properly

232. By Tiago Salem Herrmann

Remove debugs

233. By Tiago Salem Herrmann

- use cache for getSingleThread when grouped
- keep reverse map to avoid comparing the entire list

234. By Tiago Salem Herrmann

remove old code

235. By Tiago Salem Herrmann

keep accountId and threadId in memory.

236. By Tiago Salem Herrmann

remove unused method

237. By Tiago Salem Herrmann

update cache properly when threads are removed

238. By Tiago Salem Herrmann

compare using normalized ids

239. By Tiago Salem Herrmann

use own thread to compare when there are no grouped threads

240. By Tiago Salem Herrmann

Test all threads, as one participant might be in another as a group chat participant

241. By Tiago Salem Herrmann

update cache when events are removed as well

242. By Tiago Salem Herrmann

Skip empty threadIds
Make a copy of conversationKey to avoid crashes

243. By Tiago Salem Herrmann

merge parent branch

244. By Tiago Salem Herrmann

improve performance a bit

245. By Tiago Salem Herrmann

Add tests

246. By Tiago Salem Herrmann

Fix empty thread removal and improve tests

247. By Tiago Salem Herrmann

fix comment

248. By Tiago Salem Herrmann

check if FieldGroupedThreads is present before iterating threads

249. By Tiago Salem Herrmann

Use QVariantList instead of QList<QVariantMap>

250. By Tiago Salem Herrmann

create History::FieldGroupingProperty and use as applicable

251. By Tiago Salem Herrmann

add fixme

252. By Tiago Salem Herrmann

- overload generateThreadMapKey(QString,QString)
- remove unused Q_DECLARE_METATYPE

253. By Tiago Salem Herrmann

change "lastEventTimestamp" by History::FieldLastEventTimestamp

254. By Tiago Salem Herrmann

replace QList<Thread> by History::Threads

Unmerged revisions

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