[Merge] lp:~phablet-team/history-service/group-chat into lp:history-service/staging

[Gustavo Pichorim Boiko]

Review: Approve

Looks good!

Diff comments:

> 
> === modified file 'plugins/sqlite/sqlitehistoryplugin.cpp'
> --- plugins/sqlite/sqlitehistoryplugin.cpp	2015-11-20 11:40:36 +0000
> +++ plugins/sqlite/sqlitehistoryplugin.cpp	2016-10-19 13:05:42 +0000
> @@ -310,7 +346,9 @@
>      // select all the threads the first participant is listed in, and from that list
>      // check if any of the threads has all the other participants listed
>      // FIXME: find a better way to do this
> -    QString queryString("SELECT threadId FROM thread_participants WHERE %1 AND type=:type AND accountId=:accountId");
> +    QString queryString("SELECT threadId FROM thread_participants WHERE %1 AND type=:type AND accountId=:accountId "
> +                        "AND (SELECT chatType FROM threads WHERE threads.threadId=thread_participants.threadId AND "

We need also to compare the accountId here in the inner select statement.

> +                        "      threads.type=thread_participants.type)!=:chatType");
>  
>      // FIXME: for now we just compare differently when using MatchPhoneNumber
>      QString firstParticipant = participants.first();


-- 
https://code.launchpad.net/~phablet-team/history-service/group-chat/+merge/308426
Your team Ubuntu Phablet Team is subscribed to branch lp:history-service/staging.