Revert "Integrate fix for NB#272117"2011W432011W42

This reverts commit 6a547b0b74faa3fabbe1656b2d8a45d2be59c40f.

6 files changed, 14 insertions, 67 deletions

diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp
index 7f888f0b..a6447c31 100644
--- a/src/libraries/qmfclient/qmailstore_p.cpp
+++ b/src/libraries/qmfclient/qmailstore_p.cpp
@@ -3385,6 +3385,10 @@ void QMailStorePrivate::updateMessageValues(const QMailMessageKey::Properties& p
                 metaData.setResponseType(extractor.responseType());
                 break;
 
+            case QMailMessageKey::Custom:
+                metaData.setCustomFields(customFields);
+                break;
+
             case QMailMessageKey::CopyServerUid:
                 metaData.setCopyServerUid(extractor.copyServerUid());
                 break;
@@ -3421,11 +3425,6 @@ void QMailStorePrivate::updateMessageValues(const QMailMessageKey::Properties& p
     if (it != values.constEnd())
         qWarning() << QString("updateMessageValues: %1 values not consumed!").arg(values.constEnd() - it);
 
-    // QMailMessageKey::Custom is a "special" kid.
-    if ((properties & QMailMessageKey::Custom)) {
-        metaData.setCustomFields(customFields);
-    }
-
     // The target message is not completely loaded
     metaData.setStatus(QMailMessage::UnloadedData, true);
 }
@@ -4322,9 +4321,8 @@ QMailThread QMailStorePrivate::thread(const QMailThreadId &id) const
 
 QMailMessageMetaData QMailStorePrivate::messageMetaData(const QMailMessageId &id) const
 {
-    if (messageCache.contains(id)) {
+    if (messageCache.contains(id))
         return messageCache.lookup(id);
-    }
 
     //if not in the cache, then preload the cache with the id and its most likely requested siblings
     preloadHeaderCache(id);
@@ -6203,7 +6201,7 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateMessagesMetaDat
     foreach (const QMailMessageId& id, *updatedMessageIds) {
         if (messageCache.contains(id)) {
             QMailMessageMetaData cachedMetaData = messageCache.lookup(id);
-            updateMessageValues(props, extractedValues, data.customFields(), cachedMetaData);
+            updateMessageValues(properties, extractedValues, data.customFields(), cachedMetaData);
             cachedMetaData.setUnmodified();
             messageCache.insert(cachedMetaData);
             uidCache.insert(qMakePair(cachedMetaData.parentAccountId(), cachedMetaData.serverUid()), cachedMetaData.id());
@@ -6973,9 +6971,8 @@ void QMailStorePrivate::preloadHeaderCache(const QMailMessageId& id) const
         if (metaData.id().isValid()) {
             messageCache.insert(metaData);
             uidCache.insert(qMakePair(metaData.parentAccountId(), metaData.serverUid()), metaData.id());
-            if (metaData.id() == id) {
+            if (metaData.id() == id)
                 result = metaData;
-            }
         }
     }
 }
@@ -8262,9 +8259,6 @@ void QMailStorePrivate::emitIpcNotification(const QMailMessageIdList& ids,  cons
 
         if(messageCache.contains(id)) {
             QMailMessageMetaData metaData = messageCache.lookup(id);
-            if ((properties & QMailMessageKey::Custom)) {
-                metaData.setCustomFields(data.customFields());
-            }
             foreach (QMailMessageKey::Property p, messagePropertyList()) {
                 switch (properties & p)
                 {
diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
index e890dad6..f28b73ed 100644
--- a/src/plugins/messageservices/smtp/smtpclient.cpp
+++ b/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -847,10 +847,6 @@ void SmtpClient::operationFailed(int code, const QString &text)
 
 void SmtpClient::operationFailed(QMailServiceAction::Status::ErrorCode code, const QString &text)
 {
-    QMailServiceAction::Status status;
-    status.messageId = mailItr->mail.id();
-    status.errorCode = code;
-
     if (code != QMailServiceAction::Status::ErrNoError) {
         delete authTimeout;
         authTimeout = 0;
@@ -877,7 +873,7 @@ void SmtpClient::operationFailed(QMailServiceAction::Status::ErrorCode code, con
     msg.append(bufferedResponse);
     msg.append(text);
 
-    emit errorOccurred(status, msg);
+    emit errorOccurred(code, msg);
 }
 
 void SmtpClient::sendMoreData(qint64 bytesWritten)
diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h
index df072802..a0c1f89f 100644
--- a/src/plugins/messageservices/smtp/smtpclient.h
+++ b/src/plugins/messageservices/smtp/smtpclient.h
@@ -80,7 +80,7 @@ public:
 
 signals:
     void errorOccurred(int, const QString &);
-    void errorOccurred(const QMailServiceAction::Status &, const QString &);
+    void errorOccurred(QMailServiceAction::Status::ErrorCode, const QString &);
     void updateStatus(const QString &);
 
     void progressChanged(uint, uint);
diff --git a/src/plugins/messageservices/smtp/smtpservice.cpp b/src/plugins/messageservices/smtp/smtpservice.cpp
index af214adb..eb986944 100644
--- a/src/plugins/messageservices/smtp/smtpservice.cpp
+++ b/src/plugins/messageservices/smtp/smtpservice.cpp
@@ -124,7 +124,7 @@ SmtpService::SmtpService(const QMailAccountId &accountId)
     connect(&_client, SIGNAL(progressChanged(uint, uint)), this, SIGNAL(progressChanged(uint, uint)));
 
     connect(&_client, SIGNAL(errorOccurred(int, QString)), this, SLOT(errorOccurred(int, QString)));
-    connect(&_client, SIGNAL(errorOccurred(QMailServiceAction::Status, QString)), this, SLOT(errorOccurred(QMailServiceAction::Status, QString)));
+    connect(&_client, SIGNAL(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)), this, SLOT(errorOccurred(QMailServiceAction::Status::ErrorCode, QString)));
     connect(&_client, SIGNAL(updateStatus(QString)), this, SLOT(updateStatus(QString)));
 
     _client.setAccount(accountId);
@@ -172,9 +172,9 @@ void SmtpService::errorOccurred(int code, const QString &text)
     emit actionCompleted(false);
 }
 
-void SmtpService::errorOccurred(const QMailServiceAction::Status & status, const QString &text)
+void SmtpService::errorOccurred(QMailServiceAction::Status::ErrorCode code, const QString &text)
 {
-    updateStatus(status.errorCode, text, _client.account(), status.folderId, status.messageId);
+    updateStatus(code, text, _client.account());
     emit actionCompleted(false);
 }
 
diff --git a/src/plugins/messageservices/smtp/smtpservice.h b/src/plugins/messageservices/smtp/smtpservice.h
index 486abff7..0bf01db6 100644
--- a/src/plugins/messageservices/smtp/smtpservice.h
+++ b/src/plugins/messageservices/smtp/smtpservice.h
@@ -68,7 +68,7 @@ public slots:
 
 protected slots:
     void errorOccurred(int code, const QString &text);
-    void errorOccurred(const QMailServiceAction::Status & status, const QString &text);
+    void errorOccurred(QMailServiceAction::Status::ErrorCode code, const QString &text);
 
     void updateStatus(const QString& text);
 
diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index 6935513f..082b6b2c 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -398,41 +398,6 @@ QList<QString> contentIdentifiers(QList<QMailMessageMetaData*> list)
     return result;
 }
 
-const QString DontSend = "dontSend";
-const QString SendFailedTime = "sendFailedTime";
-const uint MaxSendFailedAttempts = 5;
-
-void markFailedMessage(QMailServerRequestType requestType, const QMailServiceAction::Status & status)
-{
-    switch (requestType) {
-    case TransmitMessagesRequestType:
-        {
-            if (status.messageId.isValid()) {
-                QMailMessageMetaData metaData(status.messageId);
-
-                if (metaData.customField(DontSend) != "true") {
-                    uint sendFailedCount = metaData.customField(DontSend).toUInt();
-                    ++sendFailedCount;
-                    if (sendFailedCount >= MaxSendFailedAttempts) {
-                        metaData.setCustomField(DontSend, "true");
-                    }
-                    else {
-                        metaData.setCustomField(DontSend, QString::number(sendFailedCount));
-                    }
-                }
-                metaData.setCustomField(SendFailedTime,
-                                        QString::number(QDateTime::currentDateTimeUtc().toTime_t()));
-                QMailStore::instance()->updateMessagesMetaData(
-                            QMailMessageKey::id(status.messageId),
-                            QMailMessageKey::Custom, metaData);
-            }
-        }
-        break;
-    default:
-        break;
-    }
-}
-
 }
 
 
@@ -1330,12 +1295,8 @@ bool ServiceHandler::dispatchTransmitMessages(quint64 action, const QByteArray &
         // Transmit any messages in the Outbox for this account
         QMailMessageKey accountKey(QMailMessageKey::parentAccountId(accountId));
         QMailMessageKey outboxKey(QMailMessageKey::status(QMailMessage::Outbox) & ~QMailMessageKey::status(QMailMessage::Trash));
-        QMailMessageKey sendKey(QMailMessageKey::customField("dontSend", "true", QMailDataComparator::NotEqual));
-        QMailMessageKey noSendKey(QMailMessageKey::customField("dontSend", QMailDataComparator::Absent));
 
-        QMailMessageIdList toTransmit(
-                    QMailStore::instance()->queryMessages(
-                        accountKey & outboxKey & (noSendKey | sendKey)));
+        QMailMessageIdList toTransmit(QMailStore::instance()->queryMessages(accountKey & outboxKey));
 
         bool success(sinkService.value(sink)->usesConcurrentActions()
                      ? sink->transmitMessages(toTransmit, action)
@@ -2674,10 +2635,6 @@ void ServiceHandler::reportFailure(quint64 action, QMailServiceAction::Status::E
 
 void ServiceHandler::reportFailure(quint64 action, const QMailServiceAction::Status status)
 {
-    if (status.errorCode != QMailServiceAction::Status::ErrNoError) {
-        markFailedMessage(mActiveActions[action].description, status);
-    }
-
     emit statusChanged(action, status);
 
     // Treat all errors as failures