[Merge] lp:~boiko/history-service/cached_contact_matching into lp:history-service

[Gustavo Pichorim Boiko]

Remarks addressed and questions answered.

Diff comments:

> 
> === modified file 'plugins/sqlite/sqlitehistoryplugin.cpp'
> --- plugins/sqlite/sqlitehistoryplugin.cpp	2015-10-08 19:36:10 +0000
> +++ plugins/sqlite/sqlitehistoryplugin.cpp	2015-10-08 19:36:10 +0000
> @@ -841,6 +876,12 @@
>          QString accountId = query.value(0).toString();
>          QString threadId = query.value(1).toString();
>          QString eventId = query.value(2).toString();
> +
> +        // ignore events that don't have a threadId or an eventId
> +        if (threadId.trimmed().isEmpty() || eventId.trimmed().isEmpty()) {

This is not excluding threads with no events, it is only excluding events with empty threadIds and eventIds. I think even for drafts we want to save them with a temporary eventId just to be able to handle it later.

> +            continue;
> +        }
> +
>          event[History::FieldType] = (int) type;
>          event[History::FieldAccountId] = accountId;
>          event[History::FieldThreadId] = threadId;


-- 
https://code.launchpad.net/~boiko/history-service/cached_contact_matching/+merge/272188
Your team Ubuntu Phablet Team is subscribed to branch lp:history-service.