Implemented thread merging

It can happen that thread messages are not delivered in order, which
means we will have to merge threads once all messages are available.

1 files changed, 175 insertions, 0 deletions

diff --git a/tests/threaddata/thread6 b/tests/threaddata/thread6
new file mode 100644
index 0000000..5ff64ff
--- /dev/null
+++ b/tests/threaddata/thread6
@@ -0,0 +1,175 @@
+Return-Path: <kde-community-bounces@kde.org>
+Received: from imapb010.mykolab.com ([unix socket])
+         by imapb010.mykolab.com (Cyrus 2.5.10-49-g2e214b4-Kolab-2.5.10-8.1.el7.kolab_14) with LMTPA;
+         Thu, 17 Aug 2017 01:47:27 +0200
+X-Sieve: CMU Sieve 2.4
+Received: from int-mx002.mykolab.com (unknown [10.9.13.2])
+        by imapb010.mykolab.com (Postfix) with ESMTPS id 2CC5214A68D1A
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:27 +0200 (CEST)
+Received: from mx.kolabnow.com (unknown [10.9.4.2])
+        by int-mx002.mykolab.com (Postfix) with ESMTPS id 13C82F44
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:27 +0200 (CEST)
+X-Virus-Scanned: amavisd-new at mykolab.com
+Authentication-Results: ext-mx-in002.mykolab.com (amavisd-new);
+        dkim=pass (1024-bit key) header.d=kde.org
+X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0
+Received: from forward1-smtp.messagingengine.com (forward1-smtp.messagingengine.com [66.111.4.223])
+        by ext-mx-in002.mykolab.com (Postfix) with ESMTPS id DA7D7211
+        for <christian@mailqueue.ch>; Thu, 17 Aug 2017 01:47:15 +0200 (CEST)
+Received: from mailredirect.nyi.internal (imap36.nyi.internal [10.202.2.86])
+        by mailforward.nyi.internal (Postfix) with ESMTP id F078A4C
+        for <christian@mailqueue.ch>; Wed, 16 Aug 2017 19:47:14 -0400 (EDT)
+Received: by mailredirect.nyi.internal (Postfix, from userid 501)
+        id D2D7E8E231; Wed, 16 Aug 2017 19:47:14 -0400 (EDT)
+Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
+         by sloti36d2t28 (Cyrus fastmail-fmjessie44745-15358-git-fastmail-15358) with LMTPA;
+         Wed, 16 Aug 2017 19:47:14 -0400
+X-Cyrus-Session-Id: sloti36d2t28-1787481-1502927234-2-5475491779407099440
+X-Sieve: CMU Sieve 3.0
+X-Spam-known-sender: yes ("Address thomas.pfeiffer@kde.org in From header is in addressbook");
+ in-addressbook
+X-Orig-Spam-score: 0.0
+X-Spam-hits: BAYES_00 -1.9, RCVD_IN_DNSWL_MED -2.3, RCVD_IN_SORBS_SPAM 0.5,
+  RP_MATCHES_RCVD -0.001, SPF_PASS -0.001, LANGUAGES en, BAYES_USED global,
+  SA_VERSION 3.4.0
+X-Spam-source: IP='46.4.96.248', Host='postbox.kde.org', Country='DE', FromHeader='org',
+  MailFrom='org'
+X-Spam-charsets: plain='us-ascii'
+X-Resolved-to: chrigi_1@fastmail.fm
+X-Delivered-to: chrigi_1@fastmail.fm
+X-Mail-from: kde-community-bounces@kde.org
+Received: from mx6 ([10.202.2.205])
+  by compute1.internal (LMTPProxy); Wed, 16 Aug 2017 19:47:14 -0400
+Authentication-Results: mx6.messagingengine.com;
+    dkim=pass (1024-bit rsa key sha256) header.d=kde.org header.i=@kde.org header.b=jjcN/rDm;
+    dmarc=none (p=none;has-list-id=yes) header.from=kde.org;
+    spf=pass smtp.mailfrom=kde-community-bounces@kde.org smtp.helo=postbox.kde.org;
+    x-google-dkim=pass (2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=MDpKFUTu
+Received-SPF: pass
+    (kde.org: 46.4.96.248 is authorized to use 'kde-community-bounces@kde.org' in 'mfrom' identity (mechanism 'mx' matched))
+    receiver=mx6.messagingengine.com;
+    identity=mailfrom;
+    envelope-from="kde-community-bounces@kde.org";
+    helo=postbox.kde.org;
+    client-ip=46.4.96.248
+Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
+        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+        (No client certificate requested)
+        by mx6.messagingengine.com (Postfix) with ESMTPS
+        for <chrigi_1@fastmail.fm>; Wed, 16 Aug 2017 19:47:13 -0400 (EDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
+        t=1502927232; bh=ZPaDxaRw15uQ6A7HkCF2KoV4m+FrAkqde8P/U1SNqY8=;
+        h=From:To:Subject:Date:In-Reply-To:References:Reply-To:List-Id:
+         List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
+         From;
+        b=jjcN/rDm5jM+2ttx4iyMXexUXHMS9OAzt1cfA461VOjTfg9ZPg+Kt1qCqUVzJNoSj
+         tXrKk69VVjb7tr4GNWJMKc2FAb5P33ndx6UC08kFDADMECoxSgwbHeKWdKCLE0KqOH
+         sCtYBZp0heUQzEztcQtjwtPuExHqivuLyYqZRvyM=
+X-Original-To: kde-community@kde.org
+X-Remote-Delivered-To: kde-community@localhost.kde.org
+Received-SPF: Pass (sender SPF authorized) identity=mailfrom;
+ client-ip=209.85.128.174; helo=mail-wr0-f174.google.com;
+ envelope-from=t.pfeiffer.ux@gmail.com; receiver=kde-community@kde.org 
+Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com
+ [209.85.128.174])
+ by postbox.kde.org (Postfix) with ESMTPS id 6AB96A029E
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 23:46:52 +0000 (UTC)
+Received: by mail-wr0-f174.google.com with SMTP id b65so29404863wrd.0
+ for <kde-community@kde.org>; Wed, 16 Aug 2017 16:46:52 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:subject:date:message-id:organization
+ :in-reply-to:references:mime-version:content-transfer-encoding;
+ bh=vOHtuq150Bi0dtLwrlvhmLXneJGQN+nwYPMD7ClfMTY=;
+ b=MDpKFUTuVW39/V5tI6WXpiuZNRgPorWVPEILVo6uTCaSPIWU4FPwx/FYFqYRnwLLZ4
+ JwLB2+R6USx5jpbjlgx7GDEuCAAGm+GI7GtyLRb0tZZMtXW7glpa2IuqLPTtIygXQSn4
+ nsSRysSlT02zZ26qbDXYeoWUOpn2CK2fmQ9l9q29GdTmC/+Ud4vfJqdW/nvnczqZVyyF
+ zUsQuOalp0VORBdSgDxDrtEA50pR+8TrnBu48u4OSigb4d6QgqZvPEYSPp7UWHmuEoBe
+ F92VN6efXYqb4tRUthsfokDw7l1TFhRB0g0UOl7BxXrRT54MGceiJ4fY8jVD+7+DN3aT
+ pD3g==
+X-Gm-Message-State: AHYfb5gfW1I+uGmtawofLSI0ZX4ZfkMah5Eyn73zmN/CEJ0d9ZDOFpsR
+ Y4FpRIYROX0uhR9L
+X-Received: by 10.28.11.131 with SMTP id 125mr45861wml.82.1502927211295;
+ Wed, 16 Aug 2017 16:46:51 -0700 (PDT)
+Received: from lenovo.localnet ([2a02:8071:31c0:f00:626c:66ff:fe3f:93eb])
+ by smtp.gmail.com with ESMTPSA id r70sm3132823wmb.35.2017.08.16.16.46.48
+ for <kde-community@kde.org>
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+ Wed, 16 Aug 2017 16:46:49 -0700 (PDT)
+From: Thomas Pfeiffer <thomas.pfeiffer@kde.org>
+To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+Subject: Re: Telemetry Policy
+Date: Thu, 17 Aug 2017 01:46:48 +0200
+Message-ID: <5231282.Ch11jfsTMl@lenovo>
+Organization: KDE
+In-Reply-To: <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+References: <2048912.XfIJe3ZSdj@vkpc5> <2990543.KVDkBByYO0@minixfox>
+ <CACpu024EH1OeDqwL94QK33eq4sCGjKjwedcQDR_PWjprBevzfg@mail.gmail.com>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+X-BeenThere: kde-community@kde.org
+X-Mailman-Version: 2.1.16
+Precedence: list
+Reply-To: informing about and discussing non-technical community topics
+ <kde-community@kde.org>
+List-Id: informing about and discussing non-technical community topics
+ <kde-community.kde.org>
+List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=unsubscribe>
+List-Archive: <http://mail.kde.org/pipermail/kde-community/>
+List-Post: <mailto:kde-community@kde.org>
+List-Help: <mailto:kde-community-request@kde.org?subject=help>
+List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-community>,
+ <mailto:kde-community-request@kde.org?subject=subscribe>
+Errors-To: kde-community-bounces@kde.org
+Sender: "kde-community" <kde-community-bounces@kde.org>
+
+On Mittwoch, 16. August 2017 09:33:02 CEST Valorie Zimmerman wrote:
+> Hi all, Mozilla has done a lot of work on telemetry, and we might be
+> able to use some of their findings. On this page:
+> https://wiki.mozilla.org/Firefox/Data_Collection they break down the
+> data they might possibly collect into four buckets - technical (such
+> as crashes), user interaction, web activity, and sensitive (personal
+> data).
+> 
+> This bit might be relevant to our discussion: "Categories 1 & 2
+> (Technical & Interaction data)
+> Pre-Release & Release: Data may default on, provided the data is
+> exclusively in these categories (it cannot be in any other category).
+> In Release, an opt-out must be available for most types of Technical
+> and Interaction data. "
+> 
+> I think the entire page might be enlightening to this discussion. I
+> believe our analysis of needs should be more fine-grained, and that
+> some parts of what we need can be "default on" especially for
+> pre-release testing. For releases, we can provide an opt-out.
+
+Hi Valorie,
+Even if opt-out for some data is legally and even morally fine, it does not 
+align with the values we communicate to our users:
+Unlike Mozilla's Mission, our Vision mentions privacy explicitly, and we're 
+striving to make privacy our USP.
+
+Therefore I agree with others who replied in this thread: We should respect 
+privacy unnecessarily much rather than too little.
+
+In the end, of course, it's a matter of how we present this opt-in. If it's an 
+option buried in some settings dialog, we might as well not do it at all.
+
+If we, however - like Firefox does -, pfominently present that choice to users 
+the first time they run one of our applications or desktop environment and try 
+to make clear why that data collection is important for us, I don't see why we 
+could not convince a relevant number of users to opt in.
+Sure, we'll get less data than with an opt-out scheme, but let's try it out 
+first before we go for the option that carries a significant PR risk.
+
+> Other more sensitive data will need to be opt-in. I think it's a
+> mistake to treat all the data we might want all in the same way.
+
+Content (web activity for Mozilla) and personal information should not be opt-
+anything but not collected at all.
+
+Cheers,
+Thomas