From fbafb5474d8898ba1b267f4b4dfbefe39f04e72f Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Wed, 1 Mar 2017 11:14:07 +0100 Subject: [PATCH] qt: Allow creation of default keys without name * lang/qt/src/defaultkeygenerationjob.cpp (DefaultKeyGenerationJob::start): Handle empty name and email. --- lang/qt/src/defaultkeygenerationjob.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lang/qt/src/defaultkeygenerationjob.cpp b/lang/qt/src/defaultkeygenerationjob.cpp index 020f4d2a..f589384e 100644 --- a/lang/qt/src/defaultkeygenerationjob.cpp +++ b/lang/qt/src/defaultkeygenerationjob.cpp @@ -91,6 +91,11 @@ void DefaultKeyGenerationJob::slotCancel() GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString &name) { + const QString namePart = name.isEmpty() ? QString() : + QStringLiteral("name-real: %1\n").arg(name); + const QString mailPart = email.isEmpty() ? QString() : + QStringLiteral("name-email: %1\n").arg(email); + const QString args = QStringLiteral("\n" "%ask-passphrase\n" "key-type: RSA\n" @@ -99,9 +104,9 @@ GpgME::Error DefaultKeyGenerationJob::start(const QString &email, const QString "subkey-type: RSA\n" "subkey-length: 2048\n" "subkey-usage: encrypt\n" - "name-email: %1\n" - "name-real: %2\n" - "").arg(email, name); + "%1" + "%2" + "").arg(mailPart, namePart); d->job = openpgp()->keyGenerationJob(); d->job->installEventFilter(this);