wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use kleojobexecutor.h from libmessageviewer (temporary, will remove when we will remove old code)

Browse Source 
svn path=/branches/work/akonadi-ports/kdepim/; revision=1029627
wilder-work
Laurent Montel 17 years ago
parent a95901fd3e
commit 962c18f5e1
4 changed files with 1 additions and 247 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CMakeLists.txt
  2. 161
      kleojobexecutor.cpp
  3. 84
      kleojobexecutor.h
  4. 2
      objecttreeparser.cpp

1
CMakeLists.txt
Unescape View File

@ -224,7 +224,6 @@ set(kmailprivate_LIB_SRCS
messageactions.cpp
statusbarlabel.cpp
groupware_types.cpp
kleojobexecutor.cpp
messagetree.cpp
procmailparser.cpp
stringutil.cpp

161
kleojobexecutor.cpp
Unescape View File

@ -1,161 +0,0 @@
/*
Copyright (c) 2008 Volker Krause <vkrause@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "kleojobexecutor.h"
#include <kleo/decryptverifyjob.h>
#include <kleo/importjob.h>
#include <kleo/verifydetachedjob.h>
#include <kleo/verifyopaquejob.h>
#include <kdebug.h>
#include <QBuffer>
#include <QEventLoop>
#include <cassert>
using namespace KMail;
using namespace Kleo;
using namespace GpgME;
using boost::shared_ptr;
KleoJobExecutor::KleoJobExecutor( QObject* parent ) : QObject( parent )
{
setObjectName( "KleoJobExecutor" );
mEventLoop = new QEventLoop( this );
}
GpgME::VerificationResult KleoJobExecutor::exec(
Kleo::VerifyDetachedJob* job,
const QByteArray & signature,
const QByteArray & signedData )
{
kDebug() << "Starting detached verification job";
connect( job, SIGNAL(result(GpgME::VerificationResult)),
SLOT(verificationResult(GpgME::VerificationResult)) );
GpgME::Error err = job->start( signature, signedData );
if ( err )
return VerificationResult( err );
mEventLoop->exec( QEventLoop::ExcludeUserInputEvents );
return mVerificationResult;
}
GpgME::VerificationResult KleoJobExecutor::exec(
Kleo::VerifyOpaqueJob * job,
const QByteArray & signedData,
QByteArray & plainText )
{
kDebug() << "Starting opaque verification job";
connect( job, SIGNAL(result(GpgME::VerificationResult,QByteArray)),
SLOT(verificationResult(GpgME::VerificationResult,QByteArray)) );
GpgME::Error err = job->start( signedData );
if ( err ) {
plainText.clear();
return VerificationResult( err );
}
mEventLoop->exec( QEventLoop::ExcludeUserInputEvents );
plainText = mData;
return mVerificationResult;
}
std::pair< GpgME::DecryptionResult, GpgME::VerificationResult > KleoJobExecutor::exec(
Kleo::DecryptVerifyJob * job,
const QByteArray & cipherText,
QByteArray & plainText )
{
kDebug() << "Starting decryption job";
connect( job, SIGNAL(result(GpgME::DecryptionResult,GpgME::VerificationResult,QByteArray)),
SLOT(decryptResult(GpgME::DecryptionResult,GpgME::VerificationResult,QByteArray)) );
GpgME::Error err = job->start( cipherText );
if ( err ) {
plainText.clear();
return std::make_pair( DecryptionResult( err ), VerificationResult( err ) );
}
mEventLoop->exec( QEventLoop::ExcludeUserInputEvents );
plainText = mData;
return std::make_pair( mDecryptResult, mVerificationResult );
}
GpgME::ImportResult KleoJobExecutor::exec(Kleo::ImportJob* job, const QByteArray & certData)
{
connect( job, SIGNAL(result(GpgME::ImportResult)), SLOT(importResult(GpgME::ImportResult)) );
GpgME::Error err = job->start( certData );
if ( err )
return ImportResult( err );
mEventLoop->exec( QEventLoop::ExcludeUserInputEvents );
return mImportResult;
}
void KleoJobExecutor::verificationResult(const GpgME::VerificationResult & result)
{
kDebug() << "Detached verification job finished";
Kleo::Job * job = dynamic_cast<Kleo::Job*>( sender() );
assert(job);
mVerificationResult = result;
mAuditLogError = job->auditLogError();
mAuditLog = job->auditLogAsHtml();
mEventLoop->quit();
}
void KleoJobExecutor::verificationResult(const GpgME::VerificationResult & result, const QByteArray & plainText)
{
kDebug() << "Opaque verification job finished";
Kleo::Job * job = dynamic_cast<Kleo::Job*>( sender() );
assert(job);
mVerificationResult = result;
mData = plainText;
mAuditLogError = job->auditLogError();
mAuditLog = job->auditLogAsHtml();
mEventLoop->quit();
}
void KleoJobExecutor::decryptResult(
const GpgME::DecryptionResult & decryptionresult,
const GpgME::VerificationResult & verificationresult,
const QByteArray & plainText )
{
kDebug() << "Decryption job finished";
Kleo::Job * job = dynamic_cast<Kleo::Job*>( sender() );
assert(job);
mVerificationResult = verificationresult;
mDecryptResult = decryptionresult;
mData = plainText;
mAuditLogError = job->auditLogError();
mAuditLog = job->auditLogAsHtml();
mEventLoop->quit();
}
void KleoJobExecutor::importResult(const GpgME::ImportResult & result)
{
Kleo::Job * job = dynamic_cast<Kleo::Job*>( sender() );
assert(job);
mImportResult = result;
mAuditLogError = job->auditLogError();
mAuditLog = job->auditLogAsHtml();
mEventLoop->quit();
}
QString KleoJobExecutor::auditLogAsHtml() const
{
return mAuditLog;
}
#include "kleojobexecutor.moc"

84
kleojobexecutor.h
Unescape View File

@ -1,84 +0,0 @@
/*
Copyright (c) 2008 Volker Krause <vkrause@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef KMAIl_KLEOJOBEXECUTOR_H
#define KMAIl_KLEOJOBEXECUTOR_H
#include <gpgme++/decryptionresult.h>
#include <gpgme++/importresult.h>
#include <gpgme++/verificationresult.h>
#include <QtCore/QObject>
#include <utility>
class QEventLoop;
namespace Kleo {
class DecryptVerifyJob;
class ImportJob;
class VerifyDetachedJob;
class VerifyOpaqueJob;
}
namespace KMail {
/**
Helper class for synchronous execution of Kleo crypto jobs.
*/
class KleoJobExecutor : public QObject
{
Q_OBJECT
public:
KleoJobExecutor( QObject *parent = 0 );
GpgME::VerificationResult exec( Kleo::VerifyDetachedJob* job,
const QByteArray &signature,
const QByteArray &signedData );
GpgME::VerificationResult exec( Kleo::VerifyOpaqueJob* job,
const QByteArray &signedData,
QByteArray &plainText );
std::pair<GpgME::DecryptionResult,GpgME::VerificationResult> exec( Kleo::DecryptVerifyJob *job,
const QByteArray &cipherText,
QByteArray &plainText );
GpgME::ImportResult exec( Kleo::ImportJob* job, const QByteArray &certData );
GpgME::Error auditLogError() const { return mAuditLogError; }
QString auditLogAsHtml() const;
private slots:
void verificationResult( const GpgME::VerificationResult &result );
void verificationResult( const GpgME::VerificationResult &result, const QByteArray &plainText );
void decryptResult( const GpgME::DecryptionResult & decryptionresult,
const GpgME::VerificationResult & verificationresult,
const QByteArray & plainText );
void importResult( const GpgME::ImportResult &result );
private:
QEventLoop *mEventLoop;
GpgME::VerificationResult mVerificationResult;
GpgME::DecryptionResult mDecryptResult;
GpgME::ImportResult mImportResult;
QByteArray mData;
GpgME::Error mAuditLogError;
QString mAuditLog;
};
}
#endif

2
objecttreeparser.cpp
Unescape View File

@ -51,7 +51,7 @@
#include "interfaces/bodypartformatter.h"
#include "globalsettings.h"
#include "util.h"
#include "kleojobexecutor.h"
#include "libmessageviewer/kleojobexecutor.h"
#include "stringutil.h"
#include "iconnamecache.h"
#include "libmessageviewer/autoqpointer.h"

Write Preview
Loading…
Cancel
Save