diff --git a/lang/qt/src/qgpgmeencryptarchivejob.cpp b/lang/qt/src/qgpgmeencryptarchivejob.cpp index 63c55364..91086426 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.cpp +++ b/lang/qt/src/qgpgmeencryptarchivejob.cpp @@ -1,152 +1,131 @@ /* qgpgmeencryptarchivejob.cpp This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004,2007,2008 Klarälvdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH Copyright (c) 2022,2023 g10 Code GmbH Software engineering by Ingo Klöcker QGpgME 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. QGpgME 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 In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "qgpgmeencryptarchivejob.h" #include "dataprovider.h" #include "encryptarchivejob_p.h" #include "filelistdataprovider.h" -// #include #include -// #include -// -// #include -// #include -// -// #include using namespace QGpgME; using namespace GpgME; namespace { class QGpgMEEncryptArchiveJobPrivate : public EncryptArchiveJobPrivate { QGpgMEEncryptArchiveJob *q = nullptr; public: QGpgMEEncryptArchiveJobPrivate(QGpgMEEncryptArchiveJob *qq) : q{qq} { } ~QGpgMEEncryptArchiveJobPrivate() override = default; private: void start() override { q->run(); } }; } QGpgMEEncryptArchiveJob::QGpgMEEncryptArchiveJob(Context *context) : mixin_type{context} { setJobPrivate(this, std::unique_ptr{new QGpgMEEncryptArchiveJobPrivate{this}}); lateInitialization(); } static QGpgMEEncryptArchiveJob::result_type encrypt(Context *ctx, QThread *thread, const std::vector &recipients, const std::vector &paths, const std::weak_ptr &cipherText_, Context::EncryptionFlags flags, const QString &baseDirectory) { const std::shared_ptr cipherText = cipherText_.lock(); const _detail::ToThreadMover ctMover(cipherText, thread); QGpgME::FileListDataProvider in{paths}; Data indata(&in); if (!baseDirectory.isEmpty()) { indata.setFileName(baseDirectory.toStdString()); } QGpgME::QIODeviceDataProvider out{cipherText}; Data outdata(&out); flags = static_cast(flags | Context::EncryptArchive); const EncryptionResult res = ctx->encrypt(recipients, indata, outdata, flags); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(res, log, ae); } GpgME::Error QGpgMEEncryptArchiveJob::start(const std::vector &recipients, const std::vector &paths, const std::shared_ptr &cipherText, const GpgME::Context::EncryptionFlags flags) { if (!cipherText) { return Error::fromCode(GPG_ERR_INV_VALUE); } run(std::bind(&encrypt, std::placeholders::_1, std::placeholders::_2, recipients, paths, std::placeholders::_3, flags, baseDirectory()), cipherText); return {}; } -// EncryptionResult QGpgMEEncryptArchiveJob::exec(const std::vector &recipients, const QByteArray &plainText, -// const Context::EncryptionFlags eflags, QByteArray &cipherText) -// { -// const result_type r = encrypt_qba(context(), recipients, plainText, eflags, mOutputIsBase64Encoded, fileName()); -// cipherText = std::get<1>(r); -// resultHook(r); -// return mResult; -// } - -void QGpgMEEncryptArchiveJob::resultHook(const result_type &tuple) -{ - mResult = std::get<0>(tuple); -} - #include "qgpgmeencryptarchivejob.moc" diff --git a/lang/qt/src/qgpgmeencryptarchivejob.h b/lang/qt/src/qgpgmeencryptarchivejob.h index 81398d07..64c3b18f 100644 --- a/lang/qt/src/qgpgmeencryptarchivejob.h +++ b/lang/qt/src/qgpgmeencryptarchivejob.h @@ -1,82 +1,70 @@ /* qgpgmeencryptarchivejob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2023 g10 Code GmbH Software engineering by Ingo Klöcker QGpgME 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. QGpgME 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 In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifndef __QGPGME_QGPGMEENCRYPTARCHIVEJOB_H__ #define __QGPGME_QGPGMEENCRYPTARCHIVEJOB_H__ #include "encryptarchivejob.h" #include "threadedjobmixin.h" #include -#include namespace QGpgME { class QGpgMEEncryptArchiveJob #ifdef Q_MOC_RUN : public EncryptArchiveJob #else : public _detail::ThreadedJobMixin> #endif { Q_OBJECT #ifdef Q_MOC_RUN public Q_SLOTS: void slotFinished(); #endif public: explicit QGpgMEEncryptArchiveJob(GpgME::Context *context); ~QGpgMEEncryptArchiveJob() = default; GpgME::Error start(const std::vector &recipients, const std::vector &paths, const std::shared_ptr &cipherText, const GpgME::Context::EncryptionFlags flags) override; - - // GpgME::EncryptionResult exec(const std::vector &recipients, - // const std::vector &paths, - // const std::shared_ptr &cipherText, - // const GpgME::Context::EncryptionFlags flags) override; - - /* from ThreadedJobMixin */ - void resultHook(const result_type &r) override; - -private: - GpgME::EncryptionResult mResult; }; } #endif // __QGPGME_QGPGMEENCRYPTARCHIVEJOB_H__ diff --git a/lang/qt/src/qgpgmesignarchivejob.cpp b/lang/qt/src/qgpgmesignarchivejob.cpp index d9abec42..0a99627a 100644 --- a/lang/qt/src/qgpgmesignarchivejob.cpp +++ b/lang/qt/src/qgpgmesignarchivejob.cpp @@ -1,141 +1,136 @@ /* qgpgmesignarchivejob.cpp This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2004,2007,2008 Klarälvdalens Datakonsult AB Copyright (c) 2016 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH Copyright (c) 2022,2023 g10 Code GmbH Software engineering by Ingo Klöcker QGpgME 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. QGpgME 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 In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "qgpgmesignarchivejob.h" #include "dataprovider.h" #include "signarchivejob_p.h" #include "filelistdataprovider.h" #include using namespace QGpgME; using namespace GpgME; namespace { class QGpgMESignArchiveJobPrivate : public SignArchiveJobPrivate { QGpgMESignArchiveJob *q = nullptr; public: QGpgMESignArchiveJobPrivate(QGpgMESignArchiveJob *qq) : q{qq} { } ~QGpgMESignArchiveJobPrivate() override = default; private: void start() override { q->run(); } }; } QGpgMESignArchiveJob::QGpgMESignArchiveJob(Context *context) : mixin_type{context} { setJobPrivate(this, std::unique_ptr{new QGpgMESignArchiveJobPrivate{this}}); lateInitialization(); } static QGpgMESignArchiveJob::result_type sign(Context *ctx, QThread *thread, const std::vector &signers, const std::vector &paths, const std::weak_ptr &output_, const QString &baseDirectory) { const std::shared_ptr output = output_.lock(); const _detail::ToThreadMover ctMover(output, thread); QGpgME::FileListDataProvider in{paths}; Data indata(&in); if (!baseDirectory.isEmpty()) { indata.setFileName(baseDirectory.toStdString()); } QGpgME::QIODeviceDataProvider out{output}; Data outdata(&out); ctx->clearSigningKeys(); for (const Key &signer : signers) { if (!signer.isNull()) { if (const Error err = ctx->addSigningKey(signer)) { return std::make_tuple(SigningResult{err}, QString{}, Error{}); } } } const SigningResult res = ctx->sign(indata, outdata, GpgME::SignArchive); Error ae; const QString log = _detail::audit_log_as_html(ctx, ae); return std::make_tuple(res, log, ae); } GpgME::Error QGpgMESignArchiveJob::start(const std::vector &signers, const std::vector &paths, const std::shared_ptr &output) { if (!output) { return Error::fromCode(GPG_ERR_INV_VALUE); } run(std::bind(&sign, std::placeholders::_1, std::placeholders::_2, signers, paths, std::placeholders::_3, baseDirectory()), output); return {}; } -void QGpgMESignArchiveJob::resultHook(const result_type &tuple) -{ - mResult = std::get<0>(tuple); -} - #include "qgpgmesignarchivejob.moc" diff --git a/lang/qt/src/qgpgmesignarchivejob.h b/lang/qt/src/qgpgmesignarchivejob.h index ade4e8dc..2618e39a 100644 --- a/lang/qt/src/qgpgmesignarchivejob.h +++ b/lang/qt/src/qgpgmesignarchivejob.h @@ -1,76 +1,69 @@ /* qgpgmesignarchivejob.h This file is part of qgpgme, the Qt API binding for gpgme Copyright (c) 2023 g10 Code GmbH Software engineering by Ingo Klöcker QGpgME 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. QGpgME 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 In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifndef __QGPGME_QGPGMESIGNARCHIVEJOB_H__ #define __QGPGME_QGPGMESIGNARCHIVEJOB_H__ #include "signarchivejob.h" #include "threadedjobmixin.h" #include -#include namespace QGpgME { class QGpgMESignArchiveJob #ifdef Q_MOC_RUN : public SignArchiveJob #else : public _detail::ThreadedJobMixin> #endif { Q_OBJECT #ifdef Q_MOC_RUN public Q_SLOTS: void slotFinished(); #endif public: explicit QGpgMESignArchiveJob(GpgME::Context *context); ~QGpgMESignArchiveJob() = default; GpgME::Error start(const std::vector &signers, const std::vector &paths, const std::shared_ptr &output) override; - - /* from ThreadedJobMixin */ - void resultHook(const result_type &r) override; - -private: - GpgME::SigningResult mResult; }; } #endif // __QGPGME_QGPGMESIGNARCHIVEJOB_H__