diff --git a/transactions/kgpgchangedisable.h b/transactions/kgpgchangedisable.h --- a/transactions/kgpgchangedisable.h +++ b/transactions/kgpgchangedisable.h @@ -35,7 +35,6 @@ protected: bool preStart() override; - bool nextLine(const QString &line) override; }; #endif // KGPGCHANGEDISABLE_H diff --git a/transactions/kgpgchangedisable.cpp b/transactions/kgpgchangedisable.cpp --- a/transactions/kgpgchangedisable.cpp +++ b/transactions/kgpgchangedisable.cpp @@ -45,12 +45,3 @@ return true; } - -bool -KGpgChangeDisable::nextLine(const QString &line) -{ - if(keyConsidered(line, QStringList(getKeyid()))) - return false; - - return KGpgEditKeyTransaction::nextLine(line); -} diff --git a/transactions/kgpgdelkey.cpp b/transactions/kgpgdelkey.cpp --- a/transactions/kgpgdelkey.cpp +++ b/transactions/kgpgdelkey.cpp @@ -52,9 +52,7 @@ bool KGpgDelKey::nextLine(const QString &line) { - if (keyConsidered(line, fingerprints)) { - // nothing - } else if (!line.startsWith(QLatin1String("[GNUPG:] GOT_IT"))) + if (!line.startsWith(QLatin1String("[GNUPG:] GOT_IT"))) setSuccess(KGpgTransaction::TS_MSG_SEQUENCE); return false; diff --git a/transactions/kgpgsignkey.cpp b/transactions/kgpgsignkey.cpp --- a/transactions/kgpgsignkey.cpp +++ b/transactions/kgpgsignkey.cpp @@ -38,10 +38,6 @@ bool KGpgSignKey::nextLine(const QString &line) { - if (keyConsidered(line, QStringList())) - // could be any private key, so just ignore them - return false; - switch (KGpgSignTransactionHelper::nextLine(line)) { case KGpgSignTransactionHelper::handledFalse: return false; diff --git a/transactions/kgpgtransactionprivate.cpp b/transactions/kgpgtransactionprivate.cpp --- a/transactions/kgpgtransactionprivate.cpp +++ b/transactions/kgpgtransactionprivate.cpp @@ -70,8 +70,9 @@ #endif /* KGPG_DEBUG_TRANSACTIONS */ static const QString getBool = QLatin1String("[GNUPG:] GET_BOOL "); - - if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { + if (m_parent->keyConsidered(line, QStringList())) { + // already handled by keyConsidered - skip the line + } else if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { m_parent->addIdHint(line); } else if (line.startsWith(QLatin1String("[GNUPG:] BAD_PASSPHRASE "))) { // the MISSING_PASSPHRASE line comes first, in that case ignore a