Page MenuHome GnuPG
Files F34134174

No OneTemporary
Actions

View Options

diff --git a/client/reencrypt/choosekeydialog.cpp b/client/reencrypt/choosekeydialog.cpp
index 01235ad..db31b74 100644
--- a/client/reencrypt/choosekeydialog.cpp
+++ b/client/reencrypt/choosekeydialog.cpp
@@ -1,207 +1,215 @@
// SPDX-FileCopyrightText: 2025 g10 code GmbH
// SPDX-FileContributor: Carl Schwan <carl.schwan@gnupg.com>
// SPDX-License-Identifier: GPL-2.0-or-later
#include "choosekeydialog.h"
#include "certificatelineedit.h"
-#include "ews/ewsclient.h"
#include <ranges>
#include <QDialogButtonBox>
#include <QLabel>
#include <QVBoxLayout>
#include <Libkleo/DefaultKeyFilter>
#include <Libkleo/KeyCache>
#include <Libkleo/KeyFilter>
+#include <Libkleo/KeyGroup>
#include <Libkleo/KeyListModel>
#include <Libkleo/KeySelectionCombo>
#include <KAdjustingScrollArea>
#include <KLocalizedString>
#include <KMessageWidget>
#include <KTitleWidget>
#include <KUrlRequester>
using namespace Qt::StringLiterals;
namespace
{
void forceSetTabOrder(QWidget *first, QWidget *second)
{
if (!first || !second || first == second) {
return;
}
// temporarily change the focus policy of the two widgets to something
// other than Qt::NoFocus because QWidget::setTabOrder() does nothing
// if either widget has focus policy Qt::NoFocus
const auto firstFocusPolicy = first->focusPolicy();
const auto secondFocusPolicy = second->focusPolicy();
if (firstFocusPolicy == Qt::NoFocus) {
first->setFocusPolicy(Qt::StrongFocus);
}
if (secondFocusPolicy == Qt::NoFocus) {
second->setFocusPolicy(Qt::StrongFocus);
}
QWidget::setTabOrder(first, second);
if (first->focusPolicy() != firstFocusPolicy) {
first->setFocusPolicy(firstFocusPolicy);
}
if (second->focusPolicy() != secondFocusPolicy) {
second->setFocusPolicy(secondFocusPolicy);
}
}
}
ChooseKeyDialog::ChooseKeyDialog(const EwsFolder &ewsFolder, QWidget *parent)
: QDialog(parent)
, m_backup(new KUrlRequester())
, m_ewsFolder(ewsFolder)
, m_keyFilter(std::make_shared<Kleo::DefaultKeyFilter>())
, m_model{Kleo::AbstractKeyListModel::createFlatKeyListModel(this)}
{
setWindowTitle(i18nc("@title", "Choose a key to add to the recipients"));
auto layout = new QVBoxLayout(this);
auto scrollArea = new KAdjustingScrollArea(this);
scrollArea->setFocusPolicy(Qt::NoFocus);
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scrollArea->setWidget(new QWidget);
scrollArea->setFrameStyle(0);
layout->addWidget(scrollArea);
auto vLay = new QVBoxLayout(scrollArea->widget());
auto title = new KTitleWidget;
title->setText(i18nc("@title", "Folder: %1", m_ewsFolder[EwsItemFields::EwsFolderFieldDisplayName].toString()));
vLay->addWidget(title);
m_model->useKeyCache(true, Kleo::KeyList::IncludeGroups);
m_recipientsLabel = new QLabel(i18nc("@label:listbox", "Key to add to recipients"));
vLay->addWidget(m_recipientsLabel);
m_keyFilter->setIsOpenPGP(Kleo::DefaultKeyFilter::Set);
m_keyFilter->setCanEncrypt(Kleo::DefaultKeyFilter::Set);
m_keyFilter->setName(i18n("Usable for Encryption"));
m_keyFilter->setDescription(i18n("Certificates that can be used for encryption"));
m_recpLayout = new QVBoxLayout;
m_recpLayout->setContentsMargins({});
vLay->addLayout(m_recpLayout);
addRecipientWidget();
auto label = new QLabel(i18nc("@info",
"This will store the new reencrypted emails in a seperate folder \"%1 - reencrypted\".",
m_ewsFolder[EwsItemFields::EwsFolderFieldDisplayName].toString()));
label->setWordWrap(true);
vLay->addWidget(label);
// auto backupLabel = new QLabel(i18nc("@label:", "Backup folder to store the unmodified emails:"));
// layout->addWidget(backupLabel);
m_backup->setMode(KFile::Directory);
// layout->addWidget(m_backup);
m_backup->setVisible(false);
vLay->addStretch();
auto dialogButtonBox = new QDialogButtonBox(this);
dialogButtonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
connect(dialogButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(dialogButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
layout->addWidget(dialogButtonBox);
resize(std::max(sizeHint().width(), 500) + 20, sizeHint().height() + 20);
}
std::vector<GpgME::Key> ChooseKeyDialog::currentKeys() const
{
std::vector<GpgME::Key> keys;
for (const auto lineEdit : m_recpWidgets) {
- if (lineEdit->isEmpty()) {
- auto equal_key = [lineEdit](const GpgME::Key &key) -> bool {
- return key.primaryFingerprint() == lineEdit->key().primaryFingerprint();
- };
- if (std::ranges::find_if(keys, equal_key) == keys.end()) {
- keys.push_back(lineEdit->key());
- }
+ const GpgME::Key k = lineEdit->key();
+ const Kleo::KeyGroup g = lineEdit->group();
+ const GpgME::UserID u = lineEdit->userID();
+ if (!k.isNull()) {
+ keys.push_back(k);
+ } else if (!g.isNull()) {
+ const auto groupKeys = g.keys();
+ std::copy(groupKeys.begin(), groupKeys.end(), std::back_inserter(keys));
+ } else if (!u.isNull()) {
+ keys.push_back(u.parent());
}
}
+ auto last = std::unique(keys.begin(), keys.end(), [](const auto &key1, const auto &key2) {
+ return strcmp(key1.primaryFingerprint(), key2.primaryFingerprint());
+ });
+ keys.erase(last, keys.end());
+
return keys;
}
QUrl ChooseKeyDialog::backup() const
{
return m_backup->url();
}
Kleo::CertificateLineEdit *ChooseKeyDialog::addRecipientWidget()
{
return insertRecipientWidget(nullptr);
}
Kleo::CertificateLineEdit *ChooseKeyDialog::insertRecipientWidget(Kleo::CertificateLineEdit *after)
{
Q_ASSERT(!after || m_recpLayout->indexOf(after) != -1);
const auto index = after ? m_recpLayout->indexOf(after) + 1 : m_recpLayout->count();
auto lineEdit = new Kleo::CertificateLineEdit(m_model, Kleo::KeyUsage::Encrypt, m_keyFilter, this);
lineEdit->setKeyFilter(m_keyFilter);
lineEdit->setEnabled(!Kleo::KeyCache::instance()->keys().empty());
if (!after) {
m_recipientsLabel->setBuddy(lineEdit);
}
if (static_cast<unsigned>(index / 2) < m_recpWidgets.size()) {
m_recpWidgets.insert(m_recpWidgets.begin() + index / 2, lineEdit);
} else {
m_recpWidgets.push_back(lineEdit);
}
if (m_recpLayout->count() > 0) {
auto prevWidget = after ? after : m_recpLayout->itemAt(m_recpLayout->count() - 1)->widget();
forceSetTabOrder(prevWidget, lineEdit);
}
m_recpLayout->insertWidget(index, lineEdit);
connect(lineEdit, &Kleo::CertificateLineEdit::keyChanged, this, &ChooseKeyDialog::recipientsChanged);
connect(lineEdit, &Kleo::CertificateLineEdit::editingStarted, this, &ChooseKeyDialog::recipientsChanged);
connect(lineEdit, &Kleo::CertificateLineEdit::cleared, this, &ChooseKeyDialog::recipientsChanged);
return lineEdit;
}
void ChooseKeyDialog::recipientsChanged()
{
const bool hasEmptyRecpWidget = std::any_of(std::cbegin(m_recpWidgets), std::cend(m_recpWidgets), [](auto w) {
return w->isEmpty();
});
if (hasEmptyRecpWidget) {
bool foundEmpty = false;
const auto lineEdits = m_recpWidgets;
for (const auto lineEdit : lineEdits | std::views::reverse) {
if (lineEdit->isEmpty() && !foundEmpty) {
foundEmpty = true;
continue;
} else if (lineEdit->isEmpty()) {
m_recpLayout->removeWidget(lineEdit);
const auto it = std::find_if(std::begin(m_recpWidgets), std::end(m_recpWidgets), [lineEdit](const auto &r) {
return lineEdit == r;
});
m_recpWidgets.erase(it);
lineEdit->deleteLater();
}
}
} else {
addRecipientWidget();
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 8, 6:21 AM (14 h, 9 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
9f/5b/00c44670a04f1412653ac578651f

Event Timeline