From 299340a5efba8e0f7c19153e1bdb164db8815e37 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 7 Dec 2017 16:49:40 +0100
Subject: Removed inProgress

---
 .../src/domain/mime/mimetreeparser/messagepart.cpp     | 18 +++++-------------
 .../src/domain/mime/mimetreeparser/partmetadata.h      |  2 --
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 89e71a68..26382360 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -857,17 +857,14 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
     mMetaData.status = tr("Wrong Crypto Plug-In.");
     mMetaData.status_code = GPGME_SIG_STAT_NONE;
 
-    CryptoBodyPartMemento *m = verifySignature(text, signature);
-    m->exec();
-
-    if (m && !mMetaData.inProgress) {
+    if (auto *m = verifySignature(text, signature)) {
+        m->exec();
         if (!signature.isEmpty()) {
             mVerifiedText = text;
         }
         setVerificationResult(m, textNode);
-    }
-
-    if (!m && !mMetaData.inProgress) {
+        delete m;
+    } else {
         QString errorMsg;
         QString cryptPlugLibName;
         QString cryptPlugDisplayName;
@@ -893,7 +890,6 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
                                    "verified.<br />"
                                    "Reason: %1").arg(errorMsg);
     }
-    delete m;
 
     if (!mMetaData.isSigned) {
         mMetaData.creationTime = QDateTime();
@@ -1004,7 +1000,7 @@ void EncryptedMessagePart::startDecryption(const QByteArray &text, const QTextCo
 
     startDecryption(content);
 
-    if (!mMetaData.inProgress && mMetaData.isDecryptable) {
+    if (mMetaData.isDecryptable) {
         const auto codec = aCodec ? aCodec : mOtp->codecFor(mNode);
         const auto decoded = codec->toUnicode(mDecryptedData);
         if (hasSubParts()) {
@@ -1025,7 +1021,6 @@ bool EncryptedMessagePart::okDecryptMIME(KMime::Content &data)
     mError = NoError;
     auto passphraseError = false;
     auto noSecKey = false;
-    mMetaData.inProgress = false;
     mMetaData.errorText.clear();
     mMetaData.auditLogError = GpgME::Error();
     mMetaData.auditLog.clear();
@@ -1122,9 +1117,6 @@ void EncryptedMessagePart::startDecryption(KMime::Content *data)
 
     bool bOkDecrypt = okDecryptMIME(*data);
 
-    if (mMetaData.inProgress) {
-        return;
-    }
     mMetaData.isDecryptable = bOkDecrypt;
 
     if (!mMetaData.isDecryptable) {
diff --git a/framework/src/domain/mime/mimetreeparser/partmetadata.h b/framework/src/domain/mime/mimetreeparser/partmetadata.h
index 41399837..b0f2674e 100644
--- a/framework/src/domain/mime/mimetreeparser/partmetadata.h
+++ b/framework/src/domain/mime/mimetreeparser/partmetadata.h
@@ -34,7 +34,6 @@ public:
           isGoodSignature(false),
           isEncrypted(false),
           isDecryptable(false),
-          inProgress(false),
           technicalProblem(false),
           isEncapsulatedRfc822Message(false)
     {
@@ -56,7 +55,6 @@ public:
     bool isGoodSignature : 1;
     bool isEncrypted : 1;
     bool isDecryptable : 1;
-    bool inProgress : 1;
     bool technicalProblem : 1;
     bool isEncapsulatedRfc822Message : 1;
 };
-- 
cgit v1.2.3