Commit cd6ea7c6 authored by chriadam's avatar chriadam

Merge branch 'jb50753' into 'master'

[messagingframework] Ensure that specified folders are synced unconditionally. Contributes to JB#50753

See merge request mer-core/messagingframework!47
parents 2a9ab02f 7374c0b0
From 39a360d49653006e951b96315aa0e4587f9a6fcd Mon Sep 17 00:00:00 2001
From 5e765286bdcf989f5ba68a3230bd88652e8fce43 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/17] Stop _incomingDataTimer when imapprotocol object is
Subject: [PATCH 01/24] 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 4df62a5..984e263 100644
index 4df62a57..984e2638 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -3019,6 +3019,9 @@ ImapProtocol::ImapProtocol()
......@@ -24,5 +24,5 @@ index 4df62a5..984e263 100644
delete _fsm;
}
--
1.8.3-rc3
2.17.1
From bd8c9b6476c2ce24179c39b1c7624a0de260627a Mon Sep 17 00:00:00 2001
From ebfe9142f6b968a53e7796bdce081e36a852db67 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/17] Introduce acceptUntrustedCertificates() configuration.
Subject: [PATCH 02/24] Introduce acceptUntrustedCertificates() configuration.
---
src/libraries/qmfclient/qmailserviceaction.h | 2 ++
src/libraries/qmfmessageserver/qmailtransport.cpp | 29 +++++++++++++++++-----
src/libraries/qmfmessageserver/qmailtransport.h | 9 ++++++-
.../messageservices/imap/imapconfiguration.cpp | 14 +++++++++++
.../messageservices/imap/imapconfiguration.h | 5 ++++
src/plugins/messageservices/imap/imapprotocol.cpp | 10 +++++++-
src/plugins/messageservices/imap/imaptransport.cpp | 15 -----------
src/plugins/messageservices/imap/imaptransport.h | 5 ----
src/plugins/messageservices/pop/popclient.cpp | 16 ++++++++++++
.../messageservices/pop/popconfiguration.cpp | 13 ++++++++++
src/plugins/messageservices/pop/popconfiguration.h | 5 ++++
src/plugins/messageservices/smtp/smtpclient.cpp | 10 ++++++++
.../messageservices/smtp/smtpconfiguration.cpp | 10 ++++++++
.../messageservices/smtp/smtpconfiguration.h | 2 ++
src/libraries/qmfclient/qmailserviceaction.h | 2 ++
.../qmfmessageserver/qmailtransport.cpp | 29 +++++++++++++++----
.../qmfmessageserver/qmailtransport.h | 9 +++++-
.../imap/imapconfiguration.cpp | 14 +++++++++
.../messageservices/imap/imapconfiguration.h | 5 ++++
.../messageservices/imap/imapprotocol.cpp | 10 ++++++-
.../messageservices/imap/imaptransport.cpp | 15 ----------
.../messageservices/imap/imaptransport.h | 5 ----
src/plugins/messageservices/pop/popclient.cpp | 16 ++++++++++
.../messageservices/pop/popconfiguration.cpp | 13 +++++++++
.../messageservices/pop/popconfiguration.h | 5 ++++
.../messageservices/smtp/smtpclient.cpp | 10 +++++++
.../smtp/smtpconfiguration.cpp | 10 +++++++
.../messageservices/smtp/smtpconfiguration.h | 2 ++
14 files changed, 117 insertions(+), 28 deletions(-)
diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h
index 3f6a142..6ba4020 100644
index 3f6a1421..6ba4020e 100644
--- a/src/libraries/qmfclient/qmailserviceaction.h
+++ b/src/libraries/qmfclient/qmailserviceaction.h
@@ -99,6 +99,8 @@ public:
......@@ -34,7 +34,7 @@ index 3f6a142..6ba4020 100644
};
diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp
index e2699b2..b9d8e52 100644
index e2699b24..b9d8e52a 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.cpp
+++ b/src/libraries/qmfmessageserver/qmailtransport.cpp
@@ -47,6 +47,7 @@
......@@ -102,7 +102,7 @@ index e2699b2..b9d8e52 100644
/*! \internal */
diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h
index 9b56ed6..f811366 100644
index 9b56ed64..f8113661 100644
--- a/src/libraries/qmfmessageserver/qmailtransport.h
+++ b/src/libraries/qmfmessageserver/qmailtransport.h
@@ -35,6 +35,9 @@
......@@ -143,7 +143,7 @@ index 9b56ed6..f811366 100644
#endif
diff --git a/src/plugins/messageservices/imap/imapconfiguration.cpp b/src/plugins/messageservices/imap/imapconfiguration.cpp
index b4004bd..07289a1 100644
index b4004bd6..07289a1c 100644
--- a/src/plugins/messageservices/imap/imapconfiguration.cpp
+++ b/src/plugins/messageservices/imap/imapconfiguration.cpp
@@ -198,6 +198,15 @@ void ImapConfiguration::setSearchLimit(int limit)
......@@ -175,7 +175,7 @@ index b4004bd..07289a1 100644
void ImapConfigurationEditor::setDeleteMail(bool b)
diff --git a/src/plugins/messageservices/imap/imapconfiguration.h b/src/plugins/messageservices/imap/imapconfiguration.h
index f0c0569..69dc8ad 100644
index f0c0569a..69dc8ad1 100644
--- a/src/plugins/messageservices/imap/imapconfiguration.h
+++ b/src/plugins/messageservices/imap/imapconfiguration.h
@@ -85,6 +85,10 @@ public:
......@@ -198,7 +198,7 @@ index f0c0569..69dc8ad 100644
void setDeleteMail(bool b);
diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
index 984e263..f82df5a 100644
index 984e2638..f82df5a3 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -3060,10 +3060,18 @@ bool ImapProtocol::open( const ImapConfiguration& config, qint64 bufferSize)
......@@ -222,7 +222,7 @@ index 984e263..f82df5a 100644
qMailLog(IMAP) << objectName() << "Setting read buffer size to" << bufferSize;
_transport->socket().setReadBufferSize(bufferSize);
diff --git a/src/plugins/messageservices/imap/imaptransport.cpp b/src/plugins/messageservices/imap/imaptransport.cpp
index aaa2a97..7bfbea0 100644
index aaa2a97f..7bfbea06 100644
--- a/src/plugins/messageservices/imap/imaptransport.cpp
+++ b/src/plugins/messageservices/imap/imaptransport.cpp
@@ -317,21 +317,6 @@ void ImapTransport::imapClose()
......@@ -248,7 +248,7 @@ index aaa2a97..7bfbea0 100644
{
#if 0
diff --git a/src/plugins/messageservices/imap/imaptransport.h b/src/plugins/messageservices/imap/imaptransport.h
index a1c5042..50c12e5 100644
index a1c50426..50c12e51 100644
--- a/src/plugins/messageservices/imap/imaptransport.h
+++ b/src/plugins/messageservices/imap/imaptransport.h
@@ -68,11 +68,6 @@ public:
......@@ -264,7 +264,7 @@ index a1c5042..50c12e5 100644
void test();
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index 85ac855..b8aa5c7 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()
......@@ -314,7 +314,7 @@ index 85ac855..b8aa5c7 100644
}
diff --git a/src/plugins/messageservices/pop/popconfiguration.cpp b/src/plugins/messageservices/pop/popconfiguration.cpp
index b56dba0..5c6754f 100644
index b56dba07..5c6754f9 100644
--- a/src/plugins/messageservices/pop/popconfiguration.cpp
+++ b/src/plugins/messageservices/pop/popconfiguration.cpp
@@ -99,6 +99,14 @@ bool PopConfiguration::intervalCheckRoamingEnabled() const
......@@ -345,7 +345,7 @@ index b56dba0..5c6754f 100644
void PopConfigurationEditor::setDeleteMail(bool b)
diff --git a/src/plugins/messageservices/pop/popconfiguration.h b/src/plugins/messageservices/pop/popconfiguration.h
index 1644faa..fe0119c 100644
index 1644faad..fe0119c3 100644
--- a/src/plugins/messageservices/pop/popconfiguration.h
+++ b/src/plugins/messageservices/pop/popconfiguration.h
@@ -67,6 +67,10 @@ public:
......@@ -368,7 +368,7 @@ index 1644faa..fe0119c 100644
void setDeleteMail(bool b);
diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index 2789397..9e1e219 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()
......@@ -393,7 +393,7 @@ index 2789397..9e1e219 100644
QMailServiceAction::Status::ErrorCode SmtpClient::addMail(const QMailMessage& mail)
diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.cpp b/src/plugins/messageservices/smtp/smtpconfiguration.cpp
index e8807cc..23d4394 100644
index e8807cc7..23d43949 100644
--- a/src/plugins/messageservices/smtp/smtpconfiguration.cpp
+++ b/src/plugins/messageservices/smtp/smtpconfiguration.cpp
@@ -66,6 +66,11 @@ int SmtpConfiguration::smtpPort() const
......@@ -421,7 +421,7 @@ index e8807cc..23d4394 100644
{
setValue("smtpusername", str);
diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.h b/src/plugins/messageservices/smtp/smtpconfiguration.h
index e8b28a6..ed115d5 100644
index e8b28a6b..ed115d53 100644
--- a/src/plugins/messageservices/smtp/smtpconfiguration.h
+++ b/src/plugins/messageservices/smtp/smtpconfiguration.h
@@ -69,6 +69,7 @@ public:
......@@ -441,5 +441,5 @@ index e8b28a6..ed115d5 100644
void setSmtpPassword(const QString& password);
void setSmtpAuthentication(int t);
--
1.8.3-rc3
2.17.1
From 7f641c940ef2ca28f1c21a245870f4c56721c280 Mon Sep 17 00:00:00 2001
From 86e3b14ee20e9599da9a09ba5c131e8ccbf647cd 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/17] fix tests installation path.
Subject: [PATCH 03/24] fix tests installation path.
---
benchmarks/tst_messageserver/tst_messageserver.pro | 2 +-
tests/qt5/tests.xml | 532 ++++++++++-----------
tests/tests.pri | 2 +-
tests/tests.pro | 2 +-
tests/tests.xml | 532 ++++++++++-----------
tests/tst_python_email/tst_python_email.pro | 2 +-
.../tst_messageserver/tst_messageserver.pro | 2 +-
tests/qt5/tests.xml | 532 +++++++++---------
tests/tests.pri | 2 +-
tests/tests.pro | 2 +-
tests/tests.xml | 532 +++++++++---------
tests/tst_python_email/tst_python_email.pro | 2 +-
6 files changed, 536 insertions(+), 536 deletions(-)
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
index 2d50131..1dc2ddd 100644
index 2d50131a..1dc2ddd5 100644
--- a/benchmarks/tst_messageserver/tst_messageserver.pro
+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
......@@ -26,7 +26,7 @@ index 2d50131..1dc2ddd 100644
BASE=../../
include($$BASE/common.pri)
diff --git a/tests/qt5/tests.xml b/tests/qt5/tests.xml
index ffbb593..ac9464a 100644
index ffbb593f..ac9464a6 100644
--- a/tests/qt5/tests.xml
+++ b/tests/qt5/tests.xml
@@ -5,123 +5,123 @@
......@@ -1462,7 +1462,7 @@ index ffbb593..ac9464a 100644
<environments>
<scratchbox>true</scratchbox>
diff --git a/tests/tests.pri b/tests/tests.pri
index 623b19c..1d3ba39 100644
index 623b19ca..1d3ba39e 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -3,7 +3,7 @@ QT += testlib
......@@ -1475,7 +1475,7 @@ index 623b19c..1d3ba39 100644
include(../common.pri)
diff --git a/tests/tests.pro b/tests/tests.pro
index cac4494..cae0815 100644
index cac44948..cae08159 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -41,5 +41,5 @@ CONFIG += unittest
......@@ -1486,7 +1486,7 @@ index cac4494..cae0815 100644
+test_description.path = /opt/tests/qmf-qt5/test-definition
INSTALLS += test_description
diff --git a/tests/tests.xml b/tests/tests.xml
index 3a708ed..b8fff81 100644
index 3a708ed0..b8fff814 100644
--- a/tests/tests.xml
+++ b/tests/tests.xml
@@ -5,123 +5,123 @@
......@@ -2922,7 +2922,7 @@ index 3a708ed..b8fff81 100644
<environments>
<scratchbox>true</scratchbox>
diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro
index 4cde1fe..204ecd5 100644
index 4cde1fe3..204ecd5a 100644
--- a/tests/tst_python_email/tst_python_email.pro
+++ b/tests/tst_python_email/tst_python_email.pro
@@ -4,7 +4,7 @@ TARGET = tst_python_email
......@@ -2935,5 +2935,5 @@ index 4cde1fe..204ecd5 100644
INSTALLS += testdata
--
1.8.3-rc3
2.17.1
From 8efc819f896bd8456418d41d567197dd2abaaa20 Mon Sep 17 00:00:00 2001
From 0a0fa3662eb6c99bf70994e858eb5380d37a0619 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] Accounts-qt integration.
Subject: [PATCH 04/24] Accounts-qt integration.
Squashed commits, either one line description or block comment:
......@@ -3658,7 +3658,7 @@ index 771a7a45..b4dc7b32 100644
#endif
diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
index 4df62a57..6c548ee6 100644
index f82df5a3..e4e0f0e1 100644
--- a/src/plugins/messageservices/imap/imapprotocol.cpp
+++ b/src/plugins/messageservices/imap/imapprotocol.cpp
@@ -559,8 +559,11 @@ class LoginState : public ImapState
......@@ -3736,7 +3736,7 @@ index 4df62a57..6c548ee6 100644
}
return false;
@@ -3183,11 +3212,19 @@ void ImapProtocol::sendStartTLS()
@@ -3194,11 +3223,19 @@ void ImapProtocol::sendStartTLS()
_fsm->setState(&_fsm->startTlsState);
}
......@@ -3756,7 +3756,7 @@ index 4df62a57..6c548ee6 100644
void ImapProtocol::sendLogout()
{
@@ -3806,7 +3843,7 @@ QString ImapProtocol::quoteString(const QString& input)
@@ -3817,7 +3854,7 @@ QString ImapProtocol::quoteString(const QString& input)
QByteArray ImapProtocol::quoteString(const QByteArray& input)
{
......@@ -4093,7 +4093,7 @@ index a704ab57..2d1a1040 100644
#endif
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index 85ac8553..3d567135 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)
......@@ -4126,7 +4126,7 @@ index 85ac8553..3d567135 100644
}
void PopClient::messageBufferFlushed()
@@ -156,6 +168,7 @@ void PopClient::newConnection()
@@ -168,6 +180,7 @@ void PopClient::newConnection()
testing = false;
pendingDeletes = false;
lastStatusTimer.start();
......@@ -4134,7 +4134,7 @@ index 85ac8553..3d567135 100644
if (transport && transport->connected()) {
if (selected) {
// Re-use the existing connection
@@ -241,6 +254,24 @@ void PopClient::setAccount(const QMailAccountId &id)
@@ -257,6 +270,24 @@ void PopClient::setAccount(const QMailAccountId &id)
qMailLog(POP) << "Flags for POP folder" << folder.id() << folder.path() << "updated";
}
}
......@@ -4159,7 +4159,7 @@ index 85ac8553..3d567135 100644
}
QMailAccountId PopClient::accountId() const
@@ -513,12 +544,30 @@ void PopClient::processResponse(const QString &response)
@@ -529,12 +560,30 @@ void PopClient::processResponse(const QString &response)
{
if (response[0] != '+') {
// Authentication failed
......@@ -4190,7 +4190,7 @@ index 85ac8553..3d567135 100644
if (!response.isEmpty()) {
// Send the response as Base64 encoded
@@ -727,7 +776,11 @@ void PopClient::nextAction()
@@ -743,7 +792,11 @@ void PopClient::nextAction()
emit updateStatus(tr("Logging in"));
// Get the login command sequence to use
......@@ -4202,7 +4202,7 @@ index 85ac8553..3d567135 100644
nextStatus = Auth;
nextCommand = authCommands.takeFirst();
@@ -1224,6 +1277,11 @@ void PopClient::checkForNewMessages()
@@ -1240,6 +1293,11 @@ void PopClient::checkForNewMessages()
void PopClient::cancelTransfer(QMailServiceAction::Status::ErrorCode code, const QString &text)
{
operationFailed(code, text);
......@@ -4214,7 +4214,7 @@ index 85ac8553..3d567135 100644
}
void PopClient::retrieveOperationCompleted()
@@ -1321,3 +1379,72 @@ void PopClient::removeAllFromBuffer(QMailMessage *message)
@@ -1337,3 +1395,72 @@ void PopClient::removeAllFromBuffer(QMailMessage *message)
_bufferedMessages.remove(i);
}
}
......@@ -4556,7 +4556,7 @@ index 97300b99..06183262 100644
#endif
diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index 27893973..7b768e5e 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)
......@@ -4629,7 +4629,7 @@ index 27893973..7b768e5e 100644
SmtpConfiguration smtpCfg(config);
if ( smtpCfg.smtpServer().isEmpty() ) {
status = Done;
@@ -541,6 +576,31 @@ void SmtpClient::nextAction(const QString &response)
@@ -551,6 +586,31 @@ void SmtpClient::nextAction(const QString &response)
addressComponent = localAddress.toIPv4Address();
// Find the authentication mode to use
......@@ -4661,7 +4661,7 @@ index 27893973..7b768e5e 100644
QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities));
if (!authCmd.isEmpty()) {
sendCommand(authCmd);
@@ -555,14 +615,50 @@ void SmtpClient::nextAction(const QString &response)
@@ -565,14 +625,50 @@ void SmtpClient::nextAction(const QString &response)
status = Authenticated;
nextAction(QString());
}
......@@ -4712,7 +4712,7 @@ index 27893973..7b768e5e 100644
if (!response.isEmpty()) {
// Send the response as Base64 encoded, mask the debug output
@@ -570,8 +666,9 @@ void SmtpClient::nextAction(const QString &response)
@@ -580,8 +676,9 @@ void SmtpClient::nextAction(const QString &response)
bufferedResponse.clear();
return;
} else {
......@@ -4724,7 +4724,7 @@ index 27893973..7b768e5e 100644
}
} else if (responseCode == 235) {
// We are now authenticated
@@ -580,14 +677,29 @@ void SmtpClient::nextAction(const QString &response)
@@ -590,14 +687,29 @@ void SmtpClient::nextAction(const QString &response)
} else if (responseCode == 530) {
operationFailed(QMailServiceAction::Status::ErrConfiguration, response);
} else {
......@@ -4755,7 +4755,7 @@ index 27893973..7b768e5e 100644
if (mailItr == mailList.end()) {
// Nothing to send
status = Quit;
@@ -841,6 +953,10 @@ void SmtpClient::nextAction(const QString &response)
@@ -851,6 +963,10 @@ void SmtpClient::nextAction(const QString &response)
void SmtpClient::cancelTransfer(QMailServiceAction::Status::ErrorCode code, const QString &text)
{
operationFailed(code, text);
......@@ -4766,7 +4766,7 @@ index 27893973..7b768e5e 100644
}
void SmtpClient::messageProcessed(const QMailMessageId &id)
@@ -995,3 +1111,53 @@ void SmtpClient::stopTransferring()
@@ -1005,3 +1121,53 @@ void SmtpClient::stopTransferring()
status = Sent;
}
}
......@@ -5449,5 +5449,5 @@ index 26719daa..84ca9409 100644
QMailAccount account3(account1.id());
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::InvalidId);
--
2.26.2
2.17.1
From 428c566dc26d64b06dc0d560bc804c3f8754e222 Mon Sep 17 00:00:00 2001
From 4372ae2417889a38fd2352d1608cee8435150638 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/17] Start messageserver on system startup in case there are
Subject: [PATCH 05/24] Start messageserver on system startup in case there are
email accounts present
Squashed:
......@@ -16,11 +16,11 @@ Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
Squashed:
Start messageserver only after all accounts related services. Contributes JB#28613
---
src/tools/accountscheck/accountscheck.cpp | 63 ++++++++++++++++++++++
src/tools/accountscheck/accountscheck.pro | 19 +++++++
.../systemd/messageserver5-accounts-check.service | 12 +++++
src/tools/systemd/messageserver5.service | 15 ++++++
src/tools/tools.pro | 4 ++
src/tools/accountscheck/accountscheck.cpp | 63 +++++++++++++++++++
src/tools/accountscheck/accountscheck.pro | 19 ++++++
.../messageserver5-accounts-check.service | 12 ++++
src/tools/systemd/messageserver5.service | 15 +++++
src/tools/tools.pro | 4 ++
5 files changed, 113 insertions(+)
create mode 100644 src/tools/accountscheck/accountscheck.cpp
create mode 100644 src/tools/accountscheck/accountscheck.pro
......@@ -29,7 +29,7 @@ Start messageserver only after all accounts related services. Contributes JB#286
diff --git a/src/tools/accountscheck/accountscheck.cpp b/src/tools/accountscheck/accountscheck.cpp
new file mode 100644
index 0000000..364fb77
index 00000000..364fb77e
--- /dev/null
+++ b/src/tools/accountscheck/accountscheck.cpp
@@ -0,0 +1,63 @@
......@@ -98,7 +98,7 @@ index 0000000..364fb77
+}
diff --git a/src/tools/accountscheck/accountscheck.pro b/src/tools/accountscheck/accountscheck.pro
new file mode 100644
index 0000000..0c707b9
index 00000000..0c707b92
--- /dev/null
+++ b/src/tools/accountscheck/accountscheck.pro
@@ -0,0 +1,19 @@
......@@ -123,7 +123,7 @@ index 0000000..0c707b9
+INSTALLS+= target systemd
diff --git a/src/tools/systemd/messageserver5-accounts-check.service b/src/tools/systemd/messageserver5-accounts-check.service
new file mode 100644
index 0000000..c2ec29e
index 00000000..c2ec29ea
--- /dev/null
+++ b/src/tools/systemd/messageserver5-accounts-check.service
@@ -0,0 +1,12 @@
......@@ -141,7 +141,7 @@ index 0000000..c2ec29e
+WantedBy=user-session.target
diff --git a/src/tools/systemd/messageserver5.service b/src/tools/systemd/messageserver5.service
new file mode 100644
index 0000000..0d583d1
index 00000000..0d583d15
--- /dev/null
+++ b/src/tools/systemd/messageserver5.service
@@ -0,0 +1,15 @@
......@@ -161,7 +161,7 @@ index 0000000..0d583d1
+[Install]
+WantedBy=user-session.target
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index d05c337..689ad32 100644
index d05c3377..689ad320 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,2 +1,6 @@
......@@ -172,5 +172,5 @@ index d05c337..689ad32 100644
+ SUBDIRS += accountscheck
+}
--
1.8.3-rc3
2.17.1
From 11f08173dc746f86d94e8352a8f32dc3d1e44053 Mon Sep 17 00:00:00 2001
From f96179ba4c01e11f58a2197eb5e2fe6e8266c1c1 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/17] Add keepalive timer to IMAP IDLE service
Subject: [PATCH 06/24] Add keepalive timer to IMAP IDLE service
This commit introduce a dependency on nemo-keepalive via
DEFINES+=USE_KEEPALIVE
---
src/plugins/messageservices/imap/imap.pro | 4 ++++
src/plugins/messageservices/imap/imapservice.cpp | 23 +++++++++++++++++++++++
src/plugins/messageservices/imap/imapservice.h | 11 +++++++++++
src/plugins/messageservices/imap/imap.pro | 4 ++++
.../messageservices/imap/imapservice.cpp | 23 +++++++++++++++++++
.../messageservices/imap/imapservice.h | 11 +++++++++
3 files changed, 38 insertions(+)
diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
index 1c0ae6b..1b5742b 100644
index 1c0ae6bb..1b5742b4 100644
--- a/src/plugins/messageservices/imap/imap.pro
+++ b/src/plugins/messageservices/imap/imap.pro
@@ -5,6 +5,10 @@ load(qt_plugin)
......@@ -27,7 +27,7 @@ index 1c0ae6b..1b5742b 100644
QT += alignedtimer
}
diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp
index f132dd0..7cc0085 100644
index f132dd0d..7cc00856 100644
--- a/src/plugins/messageservices/imap/imapservice.cpp
+++ b/src/plugins/messageservices/imap/imapservice.cpp
@@ -1518,6 +1518,12 @@ ImapService::ImapService(const QMailAccountId &accountId)
......@@ -69,7 +69,7 @@ index f132dd0..7cc0085 100644
class ImapConfigurator : public QMailMessageServiceConfigurator
{
diff --git a/src/plugins/messageservices/imap/imapservice.h b/src/plugins/messageservices/imap/imapservice.h
index 00682a8..b3e8dd9 100644
index 00682a87..b3e8dd97 100644
--- a/src/plugins/messageservices/imap/imapservice.h
+++ b/src/plugins/messageservices/imap/imapservice.h
@@ -38,6 +38,10 @@
......@@ -105,5 +105,5 @@ index 00682a8..b3e8dd9 100644
class ImapServicePlugin : public QMailMessageServicePlugin
--
1.8.3-rc3
2.17.1
From 3daf24239f43d5c5ab28a29f70287851e54d8f5c Mon Sep 17 00:00:00 2001
From 769280d652f4828cbff7c2d0ece3d6fbbb3cf902 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/17] Use Qt5 booster to save memory.
Subject: [PATCH 07/24] Use Qt5 booster to save memory.
---
src/tools/messageserver/main.cpp | 2 +-
......@@ -10,7 +10,7 @@ Subject: [PATCH 07/17] Use Qt5 booster to save memory.
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/tools/messageserver/main.cpp b/src/tools/messageserver/main.cpp
index 9c10762..d9a35c5 100644
index 9c107629..d9a35c53 100644
--- a/src/tools/messageserver/main.cpp
+++ b/src/tools/messageserver/main.cpp
@@ -41,7 +41,7 @@
......@@ -23,7 +23,7 @@ index 9c10762..d9a35c5 100644
#ifdef USE_HTML_PARSER
// Need for html parsing by <QTextdocument> in qmailmessage.cpp, but don't need real UI
diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
index f7d9293..a092b8c 100644
index f7d92931..a092b8ce 100644
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
@@ -17,6 +17,12 @@ contains(DEFINES, USE_HTML_PARSER) {
......@@ -40,7 +40,7 @@ index f7d9293..a092b8c 100644
target.path += $$QMF_INSTALL_ROOT/bin
diff --git a/src/tools/systemd/messageserver5.service b/src/tools/systemd/messageserver5.service
index 0d583d1..a5aa05a 100644
index 0d583d15..a5aa05a9 100644
--- a/src/tools/systemd/messageserver5.service
+++ b/src/tools/systemd/messageserver5.service
@@ -1,13 +1,13 @@
......@@ -61,5 +61,5 @@ index 0d583d1..a5aa05a 100644
RestartSec=1
--
1.8.3-rc3
2.17.1
From 3b543f7c23c2906669d1041419a2e8094c8c8ea3 Mon Sep 17 00:00:00 2001
From 1c8ac90c0760b5ea00d5f5625dab35e7f4957b80 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/17] Introduce QMailAccount::HasPersistentConnection status
Subject: [PATCH 08/24] Introduce QMailAccount::HasPersistentConnection status
flag
Use QMailAccount::HasPersistentConnection status flag for IMAP idle instead of
......@@ -13,7 +13,7 @@ keepalive(less state transitions).
1 file changed, 10 insertions(+)
diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
index f352b1d..599b573 100644
index 221fa7c5..ab509afd 100644
--- a/src/libraries/qmfclient/qmailstore_p.cpp
+++ b/src/libraries/qmfclient/qmailstore_p.cpp
@@ -2671,6 +2671,10 @@ bool SSOAccountSatisfyTheProperty(Accounts::Account* ssoAccount, const QMailAcco
......@@ -27,7 +27,7 @@ index f352b1d..599b573 100644
return SSOAccountCompareProperty<quint64>(ssoAccount,
status,
argument.op, argument.valueList);
@@ -3712,11 +3716,13 @@ QMailAccount QMailStorePrivate::extractAccount(const QSharedPointer<Accounts::Ac
@@ -3713,11 +3717,13 @@ QMailAccount QMailStorePrivate::extractAccount(const QSharedPointer<Accounts::Ac
const bool& isDefault = ssoAccount->valueAsBool("email/default");
const bool& canTransmit = ssoAccount->valueAsBool("canTransmit", true);
const bool& appendSignature = ssoAccount->valueAsBool("signatureEnabled", true);
......@@ -41,7 +41,7 @@ index f352b1d..599b573 100644
result.setSignature(ssoAccount->valueAsString("signature"));
result.setFromAddress(ssoAccount->contains("fullName")?
@@ -6221,6 +6227,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou
@@ -6222,6 +6228,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou
ssoAccount->setValue("status", account->status());
const bool appendSignature = (account->status() & QMailAccount::AppendSignature);
ssoAccount->setValue("signatureEnabled", appendSignature);
......@@ -50,7 +50,7 @@ index f352b1d..599b573 100644
ssoAccount->setValue("signature", account->signature());
ssoAccount->setValue("emailaddress", account->fromAddress().address());
ssoAccount->setValue("fullName", account->fromAddress().name());
@@ -7023,6 +7031,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc
@@ -7024,6 +7032,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc
ssoAccount->setValue("status", account->status());
bool signatureEnabled = account->status() & QMailAccount::AppendSignature;
ssoAccount->setValue("signatureEnabled", signatureEnabled);
......@@ -60,5 +60,5 @@ index f352b1d..599b573 100644
ssoAccount->setValue("emailaddress", account->fromAddress().address());
ssoAccount->setValue("fullName", account->fromAddress().name());
--
1.8.3-rc3
2.17.1
From c63f681dd192b2bbf8d3cd28b77170a837f3e7bc Mon Sep 17 00:00:00 2001
From 44a6bb349ec2682372242a25bce9ac5f5ada4a49 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/17] Handle SMTP response 504.
Subject: [PATCH 10/24] Handle SMTP response 504.
Handle SMTP response 504 and reset auth method if auth from caps is
enabled.
---
src/libraries/qmfclient/ssosessionmanager.cpp | 2 +-
.../qmfmessageserver/qmailauthenticator.cpp | 2 +-
.../qmfmessageserver/qmailauthenticator.h | 2 +-
.../messageservices/imap/imapauthenticator.cpp | 50 +++++++++++-----------
.../messageservices/smtp/smtpauthenticator.cpp | 49 +++++++++++----------
src/plugins/messageservices/smtp/smtpclient.cpp | 28 ++++++++++--
src/plugins/messageservices/smtp/smtpclient.h | 1 +
src/libraries/qmfclient/ssosessionmanager.cpp | 2 +-
.../qmfmessageserver/qmailauthenticator.cpp | 2 +-
.../qmfmessageserver/qmailauthenticator.h | 2 +-
.../imap/imapauthenticator.cpp | 50 +++++++++----------
.../smtp/smtpauthenticator.cpp | 49 +++++++++---------
.../messageservices/smtp/smtpclient.cpp | 28 +++++++++--
src/plugins/messageservices/smtp/smtpclient.h | 1 +
7 files changed, 77 insertions(+), 57 deletions(-)
diff --git a/src/libraries/qmfclient/ssosessionmanager.cpp b/src/libraries/qmfclient/ssosessionmanager.cpp
index edb467d..dd469ae 100644
index edb467d1..dd469aec 100644
--- a/src/libraries/qmfclient/ssosessionmanager.cpp
+++ b/src/libraries/qmfclient/ssosessionmanager.cpp
@@ -113,7 +113,7 @@ void SSOSessionManager::cancel()
......@@ -29,7 +29,7 @@ index edb467d..dd469ae 100644
Returns true if the account has one email service enabled and a valid identity stored
in ths accounts-sso database, otherwise returns false.
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
index 373bcf2..0827ab5 100644
index 373bcf21..0827ab58 100644
--- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp
+++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp
@@ -131,7 +131,7 @@ QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration
......@@ -42,7 +42,7 @@ index 373bcf2..0827ab5 100644
QMailServiceConfiguration configuration(svcCfg);
if (!configuration.value("smtpusername").isEmpty() && authType == QMail::CramMd5Mechanism) {
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.h b/src/libraries/qmfmessageserver/qmailauthenticator.h
index 3891139..04ded03 100644
index 3891139d..04ded033 100644
--- a/src/libraries/qmfmessageserver/qmailauthenticator.h
+++ b/src/libraries/qmfmessageserver/qmailauthenticator.h
@@ -46,7 +46,7 @@ public:
......@@ -55,7 +55,7 @@ index 3891139..04ded03 100644
static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge);
#endif
diff --git a/src/plugins/messageservices/imap/imapauthenticator.cpp b/src/plugins/messageservices/imap/imapauthenticator.cpp
index 38dd4d9..46de9f4 100644
index 38dd4d9f..46de9f49 100644
--- a/src/plugins/messageservices/imap/imapauthenticator.cpp
+++ b/src/plugins/messageservices/imap/imapauthenticator.cpp
@@ -109,6 +109,25 @@ static QMail::SaslMechanism authFromCapabilities(const QStringList &capabilities
......@@ -139,7 +139,7 @@ index 38dd4d9..46de9f4 100644
}
} else {
diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.cpp b/src/plugins/messageservices/smtp/smtpauthenticator.cpp
index 8e57a76..100bdc2 100644
index 8e57a76f..100bdc27 100644
--- a/src/plugins/messageservices/smtp/smtpauthenticator.cpp
+++ b/src/plugins/messageservices/smtp/smtpauthenticator.cpp
@@ -76,6 +76,25 @@ static SmtpConfiguration::AuthType authFromCapabilities(const QStringList &capab
......@@ -222,7 +222,7 @@ index 8e57a76..100bdc2 100644
}
} else {
diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index ba0d5cf..9d8dfbd 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)
......@@ -276,7 +276,7 @@ index ba0d5cf..9d8dfbd 100644
} else {
#ifdef USE_ACCOUNTS_QT
diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h
index 1ca218a..96852b2 100644
index 1ca218a8..96852b2b 100644
--- a/src/plugins/messageservices/smtp/smtpclient.h
+++ b/src/plugins/messageservices/smtp/smtpclient.h
@@ -167,6 +167,7 @@ private:
......@@ -288,5 +288,5 @@ index 1ca218a..96852b2 100644
QTimer *authTimeout;
--
1.8.3-rc3
2.17.1
From e0b72aea5aa65d271973b33810e8099151fcfd14 Mon Sep 17 00:00:00 2001
From c9f9d1e64dd30cd28212b3de8d469c064c3e0d6e 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/17] Recreate SSO identity for smtp in case of failure.
Subject: [PATCH 11/24] 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(+)