GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Port to new setExpire()

Browse Source 
* lang/qt/src/qgpgmechangeexpiryjob.cpp (change_expiry): Use new
setExpire() instead of edit() with GpgSetExpiryTimeEditInteractor
--

Using the new setExpire() (which uses --quick-set-expire) is a lot less
complex than using gpg's edit interface. It also feels faster. Next,
I'll add support for changing the expiration time of subkeys.

GnuPG-bug-id: 5003
This commit is contained in:
Ingo Klöcker 2020-08-05 16:49:18 +02:00
parent 84c6b6e2fe
commit 8950150913
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lang/qt/src/qgpgmechangeexpiryjob.cpp
View File

@ -38,19 +38,11 @@
#include "qgpgmechangeexpiryjob.h" #include "qgpgmechangeexpiryjob.h"
#include "dataprovider.h"
#include "context.h" #include "context.h"
#include "data.h"
#include "gpgsetexpirytimeeditinteractor.h"
#include "key.h" #include "key.h"
#include <QDateTime> #include <QDateTime>
#include <cassert>
#include <memory>
#include <string>
using namespace QGpgME; using namespace QGpgME;
using namespace GpgME; using namespace GpgME;
@ -64,17 +56,13 @@ QGpgMEChangeExpiryJob::~QGpgMEChangeExpiryJob() {}
static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key &key, const QDateTime &expiry) static QGpgMEChangeExpiryJob::result_type change_expiry(Context *ctx, const Key &key, const QDateTime &expiry)
{ {
EditInteractor *ei = expiry.isValid() // convert expiry to "seconds from now"; use 1 second from now if expiry is before the current datetime
? new GpgSetExpiryTimeEditInteractor(expiry.date().toString(Qt::ISODate).toStdString()) const unsigned long expires = expiry.isValid()
: new GpgSetExpiryTimeEditInteractor(); ? std::max<qint64>(QDateTime::currentDateTime().secsTo(expiry), 1)
: 0;
QGpgME::QByteArrayDataProvider dp; auto err = ctx->setExpire(key, expires);
Data data(&dp); return std::make_tuple(err, QString(), Error());
assert(!data.isNull());
const Error err = ctx->edit(key, std::unique_ptr<EditInteractor> (ei), data);
Error ae;
const QString log = _detail::audit_log_as_html(ctx, ae);
return std::make_tuple(err, log, ae);
} }
Error QGpgMEChangeExpiryJob::start(const Key &key, const QDateTime &expiry) Error QGpgMEChangeExpiryJob::start(const Key &key, const QDateTime &expiry)