[qmf] Prevent update of message from failing due to null preview. Con…

…tributes to JB#43628

rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch

@@ -1,7 +1,7 @@
-From 861537a78563e2a4cc92bcd1913f021421b7b8e6 Mon Sep 17 00:00:00 2001
+From 3632aaf8a7ec5bc15fc3d9b296407059ce142839 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
 Date: Mon, 23 Feb 2015 13:08:24 +0200
-Subject: [PATCH 01/19] Stop _incomingDataTimer when imapprotocol object is
+Subject: [PATCH 01/21] Stop _incomingDataTimer when imapprotocol object is
  destroyed.
 
 A crash occurs in case the timer is active and the object is destroyed.
@@ -10,7 +10,7 @@ A crash occurs in case the timer is active and the object is destroyed.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
-index 6de98d68..2c945d3f 100644
+index 630b16ed..26b7837a 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
 @@ -3012,6 +3012,9 @@ ImapProtocol::ImapProtocol()
@@ -24,5 +24,5 @@ index 6de98d68..2c945d3f 100644
      delete _fsm;
  }
 -- 
-2.17.2
+2.17.1
 

rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch

@@ -1,7 +1,7 @@
-From 036c88b752d8926f1a699452a121f88c211c92ce Mon Sep 17 00:00:00 2001
+From 0b04ed285f4c1cd17a59b80ece3a884177612403 Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Mon, 13 Aug 2018 15:45:24 +0300
-Subject: [PATCH 02/19] Introduce acceptUntrustedCertificates() configuration.
+Subject: [PATCH 02/21] Introduce acceptUntrustedCertificates() configuration.
 
 ---
  src/libraries/qmfclient/qmailserviceaction.h  |  2 ++
@@ -198,7 +198,7 @@ index f0c0569a..69dc8ad1 100644
 
      void setDeleteMail(bool b);
 diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
-index 2c945d3f..35614ea5 100644
+index 26b7837a..09fd772b 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
 @@ -3053,10 +3053,18 @@ bool ImapProtocol::open( const ImapConfiguration& config, qint64 bufferSize)
@@ -264,7 +264,7 @@ index a1c50426..50c12e51 100644
      void test();
 
 diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
-index 16562e0b..595c62a9 100644
+index 85ac8553..b8aa5c7d 100644
 --- a/src/plugins/messageservices/pop/popclient.cpp
 +++ b/src/plugins/messageservices/pop/popclient.cpp
 @@ -112,6 +112,10 @@ void PopClient::createTransport()
@@ -368,7 +368,7 @@ index 1644faad..fe0119c3 100644
 
      void setDeleteMail(bool b);
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index 3560881d..876247d7 100644
+index 27893973..9e1e2198 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -201,10 +201,20 @@ void SmtpClient::newConnection()
@@ -441,5 +441,5 @@ index e8b28a6b..ed115d53 100644
      void setSmtpPassword(const QString& password);
      void setSmtpAuthentication(int t);
 -- 
-2.17.2
+2.17.1
 

rpm/0003-fix-tests-installation-path.patch

@@ -1,7 +1,7 @@
-From ff786f09e3d6edd8a11b173f4ce6cb9e7917f971 Mon Sep 17 00:00:00 2001
+From 36d0c0118c73d1942ef4d710b6f6069b9041b515 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Tue, 30 Apr 2013 14:38:17 +0300
-Subject: [PATCH 03/19] fix tests installation path.
+Subject: [PATCH 03/21] fix tests installation path.
 
 ---
  .../tst_messageserver/tst_messageserver.pro   |   2 +-
@@ -2935,5 +2935,5 @@ index 4cde1fe3..204ecd5a 100644
 
  INSTALLS += testdata
 -- 
-2.17.2
+2.17.1
 

rpm/0004-Accounts-qt-integration.patch

@@ -1,7 +1,7 @@
-From b71cf0c4f632b7156ca5078cc69ed8d71cb63305 Mon Sep 17 00:00:00 2001
+From c0abcb31d3f9d62f34acd6b974db79ae369554d8 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Wed, 29 May 2013 09:44:20 +0300
-Subject: [PATCH 04/19] Accounts-qt integration.
+Subject: [PATCH 04/21] Accounts-qt integration.
 
 Squashed commits, either one line description or block comment:
 
@@ -116,12 +116,6 @@ Auth in one step introduced by this commit, better to reduce communication with
 
 c: AUTH PLAIN <UserName and password encoded in base64>
 S: 235 2.7.0 Authentication successful
-
----
-Add missing implementation for removeSsoIdentity
-
-This hasn't every existed so could just consider removing all the related
-code.
 ---
  common.pri                                    |    6 +
  .../qmfclient/qmailaccountlistmodel.cpp       |   44 +-
@@ -3635,7 +3629,7 @@ index 621cbf72..36428286 100644
 
  #endif
 diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
-index 35614ea5..e34e9f67 100644
+index 09fd772b..7a5da761 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
 @@ -559,8 +559,11 @@ class LoginState : public ImapState
@@ -4070,7 +4064,7 @@ index a704ab57..2d1a1040 100644
 
  #endif
 diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
-index 595c62a9..092cf91c 100644
+index b8aa5c7d..c34e9e89 100644
 --- a/src/plugins/messageservices/pop/popclient.cpp
 +++ b/src/plugins/messageservices/pop/popclient.cpp
 @@ -76,10 +76,18 @@ PopClient::PopClient(QObject* parent)
@@ -4533,7 +4527,7 @@ index 97300b99..06183262 100644
 
  #endif
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index 876247d7..d8450a6d 100644
+index 9e1e2198..9d77e6c5 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -113,6 +113,11 @@ SmtpClient::SmtpClient(QObject* parent)
@@ -5426,5 +5420,5 @@ index 176a9cfd..7cb8ec88 100644
      QMailAccount account3(account1.id());
      QCOMPARE(QMailStore::instance()->lastError(), QMailStore::InvalidId);
 -- 
-2.17.2
+2.17.1
 

rpm/0005-Start-messageserver-on-system-startup-in-case-there-.patch

@@ -1,7 +1,7 @@
-From b444c7fe216da0b94f67f68786ab6ed4231b1dc1 Mon Sep 17 00:00:00 2001
+From ea5caf83e84aaaa71eeb830dbcd4f58f0440368a Mon Sep 17 00:00:00 2001
 From: Evgeny Karpov <evgeny.karpov@oss.tieto.com>
 Date: Thu, 24 Oct 2013 09:37:30 +0000
-Subject: [PATCH 05/19] Start messageserver on system startup in case there are
+Subject: [PATCH 05/21] Start messageserver on system startup in case there are
  email accounts present
 
 Squashed:
@@ -172,5 +172,5 @@ index d05c3377..689ad320 100644
 +    SUBDIRS += accountscheck
 +}
 -- 
-2.17.2
+2.17.1
 

rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch

@@ -1,7 +1,7 @@
-From c6a7e74090171af6d67bb4fc97c745c6c50fc4d2 Mon Sep 17 00:00:00 2001
+From 43c48941bb62204ba2022ffc7fa5fdcbe7fbfa3f Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Wed, 10 Sep 2014 14:36:13 +0300
-Subject: [PATCH 06/19] Add keepalive timer to IMAP IDLE service
+Subject: [PATCH 06/21] Add keepalive timer to IMAP IDLE service
 
 This commit introduce a dependency on nemo-keepalive via
 DEFINES+=USE_KEEPALIVE
@@ -204,5 +204,5 @@ index 7b688c52..1855eba5 100644
 
  class ImapServicePlugin : public QMailMessageServicePlugin
 -- 
-2.17.2
+2.17.1
 

rpm/0007-Use-Qt5-booster-to-save-memory.patch

@@ -1,7 +1,7 @@
-From a6fa0b03ba4bc51c0338f7a31f0b8ba316376b7a Mon Sep 17 00:00:00 2001
+From eef38164266cae820d6c8435233d3b3202476ad5 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Mon, 27 Oct 2014 09:49:12 +0200
-Subject: [PATCH 07/19] Use Qt5 booster to save memory.
+Subject: [PATCH 07/21] Use Qt5 booster to save memory.
 
 ---
  src/tools/messageserver/main.cpp          | 2 +-
@@ -61,5 +61,5 @@ index 0d583d15..a5aa05a9 100644
  RestartSec=1
 
 -- 
-2.17.2
+2.17.1
 

rpm/0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch

@@ -1,7 +1,7 @@
-From a1b4652fc0c67cb9d4eeeaede7ce1a3752fa5d47 Mon Sep 17 00:00:00 2001
+From 6c2c523941428b90fcf258d6397fed6230069616 Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Mon, 13 Aug 2018 17:24:36 +0300
-Subject: [PATCH 08/19] Introduce QMailAccount::HasPersistentConnection status
+Subject: [PATCH 08/21] Introduce QMailAccount::HasPersistentConnection status
  flag
 
 Use QMailAccount::HasPersistentConnection status flag for IMAP idle instead of
@@ -289,5 +289,5 @@ index 1855eba5..e1dcc6b0 100644
  };
 
 -- 
-2.17.2
+2.17.1
 

rpm/0009-Introduce-discovery-of-authentication-from-the-anoun.patch

@@ -1,7 +1,7 @@
-From 1ff27c850d5cecb5ac5dfbeb39a47daab617aeae Mon Sep 17 00:00:00 2001
+From 45501edfbeab8665996d5f972f349cbf6e48c252 Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Wed, 15 Aug 2018 11:26:49 +0300
-Subject: [PATCH 09/19] Introduce discovery of authentication from the anounced
+Subject: [PATCH 09/21] Introduce discovery of authentication from the anounced
  capabilities(IMAP/SMTP)
 
 Squashed oneliner:
@@ -540,7 +540,7 @@ index ebd7afb7..83cd6ec4 100644
  };
 
 diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
-index e34e9f67..ec1201da 100644
+index 7a5da761..a23a962b 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
 @@ -560,7 +560,7 @@ public:
@@ -786,7 +786,7 @@ index 2d1a1040..419b9508 100644
 
  #endif
 diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
-index 092cf91c..cca92dd0 100644
+index c34e9e89..f44528fd 100644
 --- a/src/plugins/messageservices/pop/popclient.cpp
 +++ b/src/plugins/messageservices/pop/popclient.cpp
 @@ -273,11 +273,10 @@ void PopClient::setAccount(const QMailAccountId &id)
@@ -1077,7 +1077,7 @@ index 06183262..23f31cb2 100644
 
  #endif
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index d8450a6d..3b87e6ef 100644
+index 9d77e6c5..ba0d5cf0 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -157,11 +157,10 @@ void SmtpClient::setAccount(const QMailAccountId &id)
@@ -1396,5 +1396,5 @@ index 1ae046d8..a7a25676 100644
 
  #endif // PASSWORDPLUGIN_H
 -- 
-2.17.2
+2.17.1
 

rpm/0010-Handle-SMTP-response-504.patch

@@ -1,7 +1,7 @@
-From f4fbc8ea0bc2e1c3b5dff51ea1649df1f6926393 Mon Sep 17 00:00:00 2001
+From dc28e5024215dc6ac2e58a7ed6b0296ea0f5150b Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Wed, 17 Dec 2014 17:16:45 +0000
-Subject: [PATCH 10/19] Handle SMTP response 504.
+Subject: [PATCH 10/21] Handle SMTP response 504.
 
 Handle SMTP response 504 and reset auth method if auth from caps is
 enabled.
@@ -222,7 +222,7 @@ index 8e57a76f..100bdc27 100644
              }
          } else {
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index 3b87e6ef..b15bf40d 100644
+index ba0d5cf0..9d8dfbde 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -112,6 +112,7 @@ SmtpClient::SmtpClient(QObject* parent)
@@ -288,5 +288,5 @@ index 1ca218a8..96852b2b 100644
      QTimer *authTimeout;
 
 -- 
-2.17.2
+2.17.1
 

rpm/0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch

@@ -1,7 +1,7 @@
-From bca2db1fc2a8743e1206112e39a100f7318a998d Mon Sep 17 00:00:00 2001
+From 39182ea80ff38dc04d864f37adfde4128ac11a8e Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Mon, 19 Jan 2015 11:25:01 +0200
-Subject: [PATCH 11/19] Recreate SSO identity for smtp in case of failure.
+Subject: [PATCH 11/21] Recreate SSO identity for smtp in case of failure.
 
 Similar to what is already done for IMAP.
 ---
@@ -10,7 +10,7 @@ Similar to what is already done for IMAP.
  2 files changed, 12 insertions(+)
 
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index b15bf40d..38de0874 100644
+index 9d8dfbde..19f69880 100644
 --- a/src/plugins/messageservices/smtp/smtpclient.cpp
 +++ b/src/plugins/messageservices/smtp/smtpclient.cpp
 @@ -118,6 +118,8 @@ SmtpClient::SmtpClient(QObject* parent)
@@ -65,5 +65,5 @@ index 96852b2b..12003c7e 100644
  #endif
  };
 -- 
-2.17.2
+2.17.1
 

rpm/0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch

@@ -1,7 +1,7 @@
-From cd99b495de9daab5b773ceb90c0771c97c102705 Mon Sep 17 00:00:00 2001
+From 16ae3f6e10729dc35d93bbbbad9b7a5a23a87a4d Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Mon, 2 Feb 2015 17:03:21 +0200
-Subject: [PATCH 12/19] Listen to sync schedule changes from buteo sync
+Subject: [PATCH 12/21] Listen to sync schedule changes from buteo sync
  framework.
 
 This commit introduces d-bus listeners inside IMAP4 service to
@@ -453,5 +453,5 @@ index a5aa05a9..9622d701 100644
 
  [Service]
 -- 
-2.17.2
+2.17.1
 

rpm/0013-Use-periodic-keepalive-instead-of-a-long-running-one.patch

@@ -1,7 +1,7 @@
-From e156cb5326a0ff8e02fd4320e161af06cc003b5f Mon Sep 17 00:00:00 2001
+From 4e5532c93ff95bc586fc914b7620c2f05b99c8e0 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Tue, 3 Feb 2015 11:22:59 +0200
-Subject: [PATCH 13/19] Use periodic keepalive instead of a long running
+Subject: [PATCH 13/21] Use periodic keepalive instead of a long running
  one(IMAP IDLE).
 
 This is a partial revert of d45bc6ca22e5f7e7a6b8e4e38ebad29794f61fcd
@@ -122,5 +122,5 @@ index 856fb4d8..8e3d8ff2 100644
      bool _buteoReplyReceived;
  #endif
 -- 
-2.17.2
+2.17.1
 

rpm/0014-Add-network-listeners-to-IDLE-connections.patch

@@ -1,7 +1,7 @@
-From 06bdf41114716dae2f8dd76809be0e0721825e3b Mon Sep 17 00:00:00 2001
+From af7e3dda3ef952f08d6af315cbc0455847abbd3b Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Fri, 6 Feb 2015 15:16:31 +0200
-Subject: [PATCH 14/19] Add network listeners to IDLE connections.
+Subject: [PATCH 14/21] Add network listeners to IDLE connections.
 
 ---
  .../messageservices/imap/imapservice.cpp      | 314 +++++++++++++++---
@@ -505,5 +505,5 @@ index 8e3d8ff2..519faab4 100644
      bool _buteoReplyReceived;
  #endif
 -- 
-2.17.2
+2.17.1
 

rpm/0015-Use-setPresistentConnection-function-when-account-it.patch

@@ -1,7 +1,7 @@
-From 0a3a72aaee6b271a4e2e978a7d6fca7348ba358f Mon Sep 17 00:00:00 2001
+From 1ade9e6ffbd0cadedb2e01b07e220d17ad938807 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
 Date: Tue, 17 Feb 2015 10:01:07 +0200
-Subject: [PATCH 15/19] Use setPresistentConnection function when account it
+Subject: [PATCH 15/21] Use setPresistentConnection function when account it
  disabled
 
 ---
@@ -41,5 +41,5 @@ index 1c756c00..5c8312c6 100644
          closeIdleSession();
      }
 -- 
-2.17.2
+2.17.1
 

rpm/0016-Do-AUTHENTICATE-PLAIN-in-two-stages.patch

@@ -1,7 +1,7 @@
-From af3a3808ec7a9c527de75edc5e3ac52f54fb9495 Mon Sep 17 00:00:00 2001
+From dd1180ba6da3f6f020fc985ce879ddbda5bde56d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
 Date: Fri, 20 Feb 2015 15:06:21 +0200
-Subject: [PATCH 16/19] Do AUTHENTICATE PLAIN in two stages
+Subject: [PATCH 16/21] Do AUTHENTICATE PLAIN in two stages
 
 Some servers(e.g yandex.ru) do not support AUTHENTICATE PLAIN in a
 single command, according to RFC4616 this way is optional, so we allways
@@ -98,5 +98,5 @@ index 20d2cf57..279f9721 100644
 
      // Currently pop account does not have any auth settings, so only plain can be used
 -- 
-2.17.2
+2.17.1