No OneTemporary
Actions

Size

63 KB

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 55223682..0b9e5b8c 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,148 +1,148 @@
	# SPDX-License-Identifier: CC0-1.0
	# SPDX-FileCopyrightText: none
	cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
	-set(PIM_VERSION "6.0.40")
	+set(PIM_VERSION "6.0.41")

	project(libkleo VERSION ${PIM_VERSION})

	set(KF_MIN_VERSION "5.248.0")

	if (WIN32)
	set(KF6_WANT_VERSION "5.104.0")
	add_compile_definitions(GPG_ERR_ENABLE_GETTEXT_MACROS=1)
	else ()
	set(KF6_WANT_VERSION ${KF_MIN_VERSION})
	endif ()

	find_package(ECM ${KF6_WANT_VERSION} CONFIG REQUIRED)
	set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})

	include(KDEInstallDirs)
	include(KDECMakeSettings)
	include(KDECompilerSettings NO_POLICY_SCOPE)

	include(ECMGenerateExportHeader)
	include(ECMSetupVersion)
	include(ECMGenerateHeaders)

	include(FeatureSummary)
	include(ECMQtDeclareLoggingCategory)
	include(ECMDeprecationSettings)
	include(ECMAddQch)
	include(KDEClangFormat)
	include(KDEGitCommitHooks)

	option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
	add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")

	set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
	set(QT_REQUIRED_VERSION "6.6.0")
	set(GPGME_REQUIRED_VERSION "1.20.0")
	set(KTEXTADDONS_MIN_VERSION "1.5.1")
	set(GPG_ERROR_REQUIRED_VERSION "1.36")

	find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
	find_package(KF6I18n ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6Config ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6WidgetsAddons ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6ColorScheme ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6Completion ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6CoreAddons ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6Codecs ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6ItemModels ${KF6_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF6TextCustomEditor ${KTEXTADDONS_MIN_VERSION} CONFIG)

	find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME++ Library" URL "https://www.gnupg.org" TYPE REQUIRED PURPOSE "GpgME++ is required for OpenPGP support")
	message(STATUS "GpgME++ Version ${Gpgmepp_VERSION}")
	set(QGPGME_NAME "QGpgmeQt6")
	if (Gpgmepp_VERSION VERSION_GREATER_EQUAL "1.23.0")
	set(GPGMEPP_KEY_HAS_HASCERTIFY_SIGN_ENCRYPT_AUTHENTICATE 1)
	endif()
	find_package(${QGPGME_NAME} ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)

	find_package(LibGpgError ${GPG_ERROR_REQUIRED_VERSION} REQUIRED)
	set_package_properties(LibGpgError PROPERTIES
	TYPE REQUIRED
	)

	find_package(Boost 1.34.0)
	set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "https://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
	ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKLEO
	VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h"
	PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
	SOVERSION 6
	)

	########### Targets ###########
	ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.248.0)

	remove_definitions(-DQT_NO_FOREACH)
	add_definitions(-DQT_NO_EMIT)
	########### CMake Config Files ###########
	set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6Libkleo")


	install(FILES
	${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h
	DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/Libkleo COMPONENT Devel
	)

	include_directories(${CMAKE_CURRENT_BINARY_DIR})

	option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)

	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
	if (USE_UNITY_CMAKE_SUPPORT)
	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
	set(UNITY_BUILD ON)
	endif()

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-libkleo.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-libkleo.h)

	add_subdirectory(src)
	if (BUILD_TESTING)
	add_subdirectory(autotests)
	add_subdirectory(tests)
	endif()

	ecm_qt_install_logging_categories(
	EXPORT LIBKLEO
	FILE libkleo.categories
	DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
	)

	ki18n_install(po)
	if (BUILD_QCH)
	ecm_install_qch_export(
	TARGETS KPim6Libkleo_QCH
	FILE KPim6LibkleoQchTargets.cmake
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)
	set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LibkleoQchTargets.cmake\")")
	endif()

	configure_package_config_file(
	"${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkleoConfig.cmake.in"
	"${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfig.cmake"
	INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
	)

	install(FILES
	"${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfig.cmake"
	"${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)

	install(EXPORT KPim6LibkleoTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim6LibkleoTargets.cmake NAMESPACE KPim6::)

	feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

	# add clang-format target for all our real source files
	file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES .cpp .h *.c)
	kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
	kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)

	diff --git a/src/models/keylistmodel.cpp b/src/models/keylistmodel.cpp
	index 2e5b2a02..425df4c9 100644
	--- a/src/models/keylistmodel.cpp
	+++ b/src/models/keylistmodel.cpp
	@@ -1,1621 +1,1655 @@
	/* -- mode: c++; c-basic-offset:4 --
	models/keylistmodel.cpp

	This file is part of libkleopatra, the KDE keymanagement library
	SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
	SPDX-FileCopyrightText: 2021 g10 Code GmbH
	SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>

	SPDX-License-Identifier: GPL-2.0-or-later
	*/

	#include <config-libkleo.h>

	#include "keylistmodel.h"

	#include "keycache.h"

	#include <libkleo/algorithm.h>
	#include <libkleo/formatting.h>
	#include <libkleo/keyfilter.h>
	#include <libkleo/keyfiltermanager.h>
	#include <libkleo/predicates.h>
	#include <libkleo/systeminfo.h>

	#include <KLocalizedString>

	#ifdef KLEO_MODEL_TEST
	#include <QAbstractItemModelTester>
	#endif
	#include <QColor>
	#include <QDate>
	#include <QFont>
	#include <QHash>
	#include <QIcon>
	+#include <QMimeData>

	#include <gpgme++/key.h>

	#ifndef Q_MOC_RUN // QTBUG-22829
	#include <boost/graph/adjacency_list.hpp>
	#include <boost/graph/topological_sort.hpp>
	#endif

	#include <algorithm>
	#include <iterator>
	#include <map>
	#include <set>

	using namespace GpgME;
	using namespace Kleo;
	using namespace Kleo::KeyList;

	#if !UNITY_BUILD
	Q_DECLARE_METATYPE(GpgME::Key)
	Q_DECLARE_METATYPE(KeyGroup)
	#endif

	class AbstractKeyListModel::Private
	{
	AbstractKeyListModel *const q;

	public:
	explicit Private(AbstractKeyListModel *qq);

	void updateFromKeyCache();

	QString getEMail(const Key &key) const;

	public:
	int m_toolTipOptions = Formatting::Validity;
	mutable QHash<const char *, QString> prettyEMailCache;
	mutable QHash<const char *, QVariant> remarksCache;
	bool m_useKeyCache = false;
	bool m_modelResetInProgress = false;
	KeyList::Options m_keyListOptions = AllKeys;
	std::vector<GpgME::Key> m_remarkKeys;
	+ std::shared_ptr<DragHandler> m_dragHandler;
	};

	AbstractKeyListModel::Private::Private(Kleo::AbstractKeyListModel *qq)
	: q(qq)
	{
	}

	void AbstractKeyListModel::Private::updateFromKeyCache()
	{
	if (m_useKeyCache) {
	const bool inReset = q->modelResetInProgress();
	if (!inReset) {
	q->beginResetModel();
	}
	q->setKeys(m_keyListOptions == SecretKeysOnly ? KeyCache::instance()->secretKeys() : KeyCache::instance()->keys());
	if (m_keyListOptions == IncludeGroups) {
	q->setGroups(KeyCache::instance()->groups());
	}
	if (!inReset) {
	q->endResetModel();
	}
	}
	}

	QString AbstractKeyListModel::Private::getEMail(const Key &key) const
	{
	QString email;
	if (const auto fpr = key.primaryFingerprint()) {
	const auto it = prettyEMailCache.constFind(fpr);
	if (it != prettyEMailCache.constEnd()) {
	email = *it;
	} else {
	email = Formatting::prettyEMail(key);
	prettyEMailCache[fpr] = email;
	}
	}
	return email;
	}

	AbstractKeyListModel::AbstractKeyListModel(QObject *p)
	: QAbstractItemModel(p)
	, KeyListModelInterface()
	, d(new Private(this))
	{
	connect(this, &QAbstractItemModel::modelAboutToBeReset, this, [this]() {
	d->m_modelResetInProgress = true;
	});
	connect(this, &QAbstractItemModel::modelReset, this, [this]() {
	d->m_modelResetInProgress = false;
	});
	}

	AbstractKeyListModel::~AbstractKeyListModel()
	{
	}

	void AbstractKeyListModel::setToolTipOptions(int opts)
	{
	d->m_toolTipOptions = opts;
	}

	int AbstractKeyListModel::toolTipOptions() const
	{
	return d->m_toolTipOptions;
	}

	void AbstractKeyListModel::setRemarkKeys(const std::vector<GpgME::Key> &keys)
	{
	d->m_remarkKeys = keys;
	}

	std::vector<GpgME::Key> AbstractKeyListModel::remarkKeys() const
	{
	return d->m_remarkKeys;
	}

	Key AbstractKeyListModel::key(const QModelIndex &idx) const
	{
	Key key = Key::null;
	if (idx.isValid()) {
	key = doMapToKey(idx);
	}
	return key;
	}

	std::vector<Key> AbstractKeyListModel::keys(const QList<QModelIndex> &indexes) const
	{
	std::vector<Key> result;
	result.reserve(indexes.size());
	std::transform(indexes.begin(), //
	indexes.end(),
	std::back_inserter(result),
	[this](const QModelIndex &idx) {
	return this->key(idx);
	});
	result.erase(std::remove_if(result.begin(), result.end(), std::mem_fn(&GpgME::Key::isNull)), result.end());
	_detail::remove_duplicates_by_fpr(result);
	return result;
	}

	KeyGroup AbstractKeyListModel::group(const QModelIndex &idx) const
	{
	if (idx.isValid()) {
	return doMapToGroup(idx);
	} else {
	return KeyGroup();
	}
	}

	QModelIndex AbstractKeyListModel::index(const Key &key) const
	{
	return index(key, 0);
	}

	QModelIndex AbstractKeyListModel::index(const Key &key, int col) const
	{
	if (key.isNull() \|\| col < 0 \|\| col >= NumColumns) {
	return {};
	} else {
	return doMapFromKey(key, col);
	}
	}

	QList<QModelIndex> AbstractKeyListModel::indexes(const std::vector<Key> &keys) const
	{
	QList<QModelIndex> result;
	result.reserve(keys.size());
	std::transform(keys.begin(), //
	keys.end(),
	std::back_inserter(result),
	[this](const Key &key) {
	return this->index(key);
	});
	return result;
	}

	QModelIndex AbstractKeyListModel::index(const KeyGroup &group) const
	{
	return index(group, 0);
	}

	QModelIndex AbstractKeyListModel::index(const KeyGroup &group, int col) const
	{
	if (group.isNull() \|\| col < 0 \|\| col >= NumColumns) {
	return {};
	} else {
	return doMapFromGroup(group, col);
	}
	}

	void AbstractKeyListModel::setKeys(const std::vector<Key> &keys)
	{
	const bool inReset = modelResetInProgress();
	if (!inReset) {
	beginResetModel();
	}
	clear(Keys);
	addKeys(keys);
	if (!inReset) {
	endResetModel();
	}
	}

	QModelIndex AbstractKeyListModel::addKey(const Key &key)
	{
	const std::vector<Key> vec(1, key);
	const QList<QModelIndex> l = doAddKeys(vec);
	return l.empty() ? QModelIndex() : l.front();
	}

	void AbstractKeyListModel::removeKey(const Key &key)
	{
	if (key.isNull()) {
	return;
	}
	doRemoveKey(key);
	d->prettyEMailCache.remove(key.primaryFingerprint());
	d->remarksCache.remove(key.primaryFingerprint());
	}

	QList<QModelIndex> AbstractKeyListModel::addKeys(const std::vector<Key> &keys)
	{
	std::vector<Key> sorted;
	sorted.reserve(keys.size());
	std::remove_copy_if(keys.begin(), keys.end(), std::back_inserter(sorted), std::mem_fn(&Key::isNull));
	std::sort(sorted.begin(), sorted.end(), _detail::ByFingerprint<std::less>());
	return doAddKeys(sorted);
	}

	void AbstractKeyListModel::setGroups(const std::vector<KeyGroup> &groups)
	{
	const bool inReset = modelResetInProgress();
	if (!inReset) {
	beginResetModel();
	}
	clear(Groups);
	doSetGroups(groups);
	if (!inReset) {
	endResetModel();
	}
	}

	QModelIndex AbstractKeyListModel::addGroup(const KeyGroup &group)
	{
	if (group.isNull()) {
	return QModelIndex();
	}
	return doAddGroup(group);
	}

	bool AbstractKeyListModel::removeGroup(const KeyGroup &group)
	{
	if (group.isNull()) {
	return false;
	}
	return doRemoveGroup(group);
	}

	void AbstractKeyListModel::clear(ItemTypes types)
	{
	const bool inReset = modelResetInProgress();
	if (!inReset) {
	beginResetModel();
	}
	doClear(types);
	if (types & Keys) {
	d->prettyEMailCache.clear();
	d->remarksCache.clear();
	}
	if (!inReset) {
	endResetModel();
	}
	}

	int AbstractKeyListModel::columnCount(const QModelIndex &) const
	{
	return NumColumns;
	}

	QVariant AbstractKeyListModel::headerData(int section, Qt::Orientation o, int role) const
	{
	if (o == Qt::Horizontal) {
	if (role == Qt::DisplayRole \|\| role == Qt::EditRole \|\| role == Qt::ToolTipRole) {
	switch (section) {
	case PrettyName:
	return i18n("Name");
	case PrettyEMail:
	return i18n("E-Mail");
	case Validity:
	return i18n("User-IDs");
	case ValidFrom:
	return i18n("Valid From");
	case ValidUntil:
	return i18n("Valid Until");
	case TechnicalDetails:
	return i18n("Protocol");
	case ShortKeyID:
	return i18n("Key-ID");
	case KeyID:
	return i18n("Key-ID");
	case Fingerprint:
	return i18n("Fingerprint");
	case Issuer:
	return i18n("Issuer");
	case SerialNumber:
	return i18n("Serial Number");
	case Origin:
	return i18n("Origin");
	case LastUpdate:
	return i18n("Last Update");
	case OwnerTrust:
	return i18n("Certification Trust");
	case Remarks:
	return i18n("Tags");
	case NumColumns:;
	}
	}
	}
	return QVariant();
	}

	static QVariant returnIfValid(const QColor &t)
	{
	if (t.isValid()) {
	return t;
	} else {
	return QVariant();
	}
	}

	static QVariant returnIfValid(const QIcon &t)
	{
	if (!t.isNull()) {
	return t;
	} else {
	return QVariant();
	}
	}

	QVariant AbstractKeyListModel::data(const QModelIndex &index, int role) const
	{
	const Key key = this->key(index);
	if (!key.isNull()) {
	return data(key, index.column(), role);
	}

	const KeyGroup group = this->group(index);
	if (!group.isNull()) {
	return data(group, index.column(), role);
	}

	return QVariant();
	}

	QVariant AbstractKeyListModel::data(const Key &key, int column, int role) const
	{
	if (role == Qt::DisplayRole \|\| role == Qt::EditRole \|\| role == Qt::AccessibleTextRole) {
	switch (column) {
	case PrettyName: {
	const auto name = Formatting::prettyName(key);
	if (role == Qt::AccessibleTextRole) {
	return name.isEmpty() ? i18nc("text for screen readers for an empty name", "no name") : name;
	}
	return name;
	}
	case PrettyEMail: {
	const auto email = d->getEMail(key);
	if (role == Qt::AccessibleTextRole) {
	return email.isEmpty() ? i18nc("text for screen readers for an empty email address", "no email") : email;
	}
	return email;
	}
	case Validity:
	return Formatting::complianceStringShort(key);
	case ValidFrom:
	if (role == Qt::EditRole) {
	return Formatting::creationDate(key);
	} else if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleCreationDate(key);
	} else {
	return Formatting::creationDateString(key);
	}
	case ValidUntil:
	if (role == Qt::EditRole) {
	return Formatting::expirationDate(key);
	} else if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleExpirationDate(key);
	} else {
	return Formatting::expirationDateString(key);
	}
	case TechnicalDetails:
	return Formatting::type(key);
	case ShortKeyID:
	if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleHexID(key.shortKeyID());
	} else {
	return Formatting::prettyID(key.shortKeyID());
	}
	case KeyID:
	if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleHexID(key.keyID());
	} else {
	return Formatting::prettyID(key.keyID());
	}
	case Summary:
	return Formatting::summaryLine(key);
	case Fingerprint:
	if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleHexID(key.primaryFingerprint());
	} else {
	return Formatting::prettyID(key.primaryFingerprint());
	}
	case Issuer:
	return QString::fromUtf8(key.issuerName());
	case Origin:
	return Formatting::origin(key.origin());
	case LastUpdate:
	if (role == Qt::AccessibleTextRole) {
	return Formatting::accessibleDate(key.lastUpdate());
	} else {
	return Formatting::dateString(key.lastUpdate());
	}
	case SerialNumber:
	return QString::fromUtf8(key.issuerSerial());
	case OwnerTrust:
	return Formatting::ownerTrustShort(key.ownerTrust());
	case Remarks: {
	const char *const fpr = key.primaryFingerprint();
	if (fpr && key.protocol() == GpgME::OpenPGP && key.numUserIDs() && d->m_remarkKeys.size()) {
	if (!(key.keyListMode() & GpgME::SignatureNotations)) {
	return i18n("Loading...");
	}
	const QHash<const char *, QVariant>::const_iterator it = d->remarksCache.constFind(fpr);
	if (it != d->remarksCache.constEnd()) {
	return *it;
	} else {
	GpgME::Error err;
	const auto remarks = key.userID(0).remarks(d->m_remarkKeys, err);
	if (remarks.size() == 1) {
	const auto remark = QString::fromStdString(remarks[0]);
	return d->remarksCache[fpr] = remark;
	} else {
	QStringList remarkList;
	remarkList.reserve(remarks.size());
	for (const auto &rem : remarks) {
	remarkList << QString::fromStdString(rem);
	}
	const auto remark = remarkList.join(QStringLiteral("; "));
	return d->remarksCache[fpr] = remark;
	}
	}
	} else {
	return QVariant();
	}
	}
	return QVariant();
	case NumColumns:
	break;
	}
	} else if (role == Qt::ToolTipRole) {
	return Formatting::toolTip(key, toolTipOptions());
	} else if (role == Qt::FontRole) {
	return KeyFilterManager::instance()->font(key,
	(column == ShortKeyID \|\| column == KeyID \|\| column == Fingerprint) ? QFont(QStringLiteral("monospace"))
	: QFont());
	} else if (role == Qt::DecorationRole) {
	return column == Icon ? returnIfValid(KeyFilterManager::instance()->icon(key)) : QVariant();
	} else if (role == Qt::BackgroundRole) {
	if (!SystemInfo::isHighContrastModeActive()) {
	return returnIfValid(KeyFilterManager::instance()->bgColor(key));
	}
	} else if (role == Qt::ForegroundRole) {
	if (!SystemInfo::isHighContrastModeActive()) {
	return returnIfValid(KeyFilterManager::instance()->fgColor(key));
	}
	} else if (role == FingerprintRole) {
	return QString::fromLatin1(key.primaryFingerprint());
	} else if (role == KeyRole) {
	return QVariant::fromValue(key);
	}
	return QVariant();
	}

	QVariant AbstractKeyListModel::data(const KeyGroup &group, int column, int role) const
	{
	if (role == Qt::DisplayRole \|\| role == Qt::EditRole \|\| role == Qt::AccessibleTextRole) {
	switch (column) {
	case PrettyName:
	return group.name();
	case Validity:
	return Formatting::complianceStringShort(group);
	case TechnicalDetails:
	return Formatting::type(group);
	case Summary:
	return Formatting::summaryLine(group); // used for filtering
	case PrettyEMail:
	case ValidFrom:
	case ValidUntil:
	case ShortKeyID:
	case KeyID:
	case Fingerprint:
	case Issuer:
	case Origin:
	case LastUpdate:
	case SerialNumber:
	case OwnerTrust:
	case Remarks:
	if (role == Qt::AccessibleTextRole) {
	return i18nc("text for screen readers", "not applicable");
	}
	break;
	case NumColumns:
	break;
	}
	} else if (role == Qt::ToolTipRole) {
	return Formatting::toolTip(group, toolTipOptions());
	} else if (role == Qt::FontRole) {
	return QFont();
	} else if (role == Qt::DecorationRole) {
	return column == Icon ? QIcon::fromTheme(QStringLiteral("group")) : QVariant();
	} else if (role == Qt::BackgroundRole) {
	} else if (role == Qt::ForegroundRole) {
	} else if (role == GroupRole) {
	return QVariant::fromValue(group);
	}
	return QVariant();
	}

	bool AbstractKeyListModel::setData(const QModelIndex &index, const QVariant &value, int role)
	{
	Q_UNUSED(role)
	Q_ASSERT(value.canConvert<KeyGroup>());
	if (value.canConvert<KeyGroup>()) {
	const KeyGroup group = value.value<KeyGroup>();
	return doSetGroupData(index, group);
	}

	return false;
	}

	bool AbstractKeyListModel::modelResetInProgress()
	{
	return d->m_modelResetInProgress;
	}

	namespace
	{
	template<typename Base>
	class TableModelMixin : public Base
	{
	public:
	explicit TableModelMixin(QObject *p = nullptr)
	: Base(p)
	{
	}
	~TableModelMixin() override
	{
	}

	using Base::index;
	QModelIndex index(int row, int column, const QModelIndex &pidx = QModelIndex()) const override
	{
	return this->hasIndex(row, column, pidx) ? this->createIndex(row, column, nullptr) : QModelIndex();
	}

	private:
	QModelIndex parent(const QModelIndex &) const override
	{
	return QModelIndex();
	}
	bool hasChildren(const QModelIndex &pidx) const override
	{
	return (pidx.model() == this \|\| !pidx.isValid()) && this->rowCount(pidx) > 0 && this->columnCount(pidx) > 0;
	}
	};

	class FlatKeyListModel
	#ifndef Q_MOC_RUN
	: public TableModelMixin<AbstractKeyListModel>
	#else
	: public AbstractKeyListModel
	#endif
	{
	Q_OBJECT
	public:
	explicit FlatKeyListModel(QObject *parent = nullptr);
	~FlatKeyListModel() override;

	int rowCount(const QModelIndex &pidx) const override
	{
	return pidx.isValid() ? 0 : mKeysByFingerprint.size() + mGroups.size();
	}

	private:
	Key doMapToKey(const QModelIndex &index) const override;
	QModelIndex doMapFromKey(const Key &key, int col) const override;
	QList<QModelIndex> doAddKeys(const std::vector<Key> &keys) override;
	void doRemoveKey(const Key &key) override;

	KeyGroup doMapToGroup(const QModelIndex &index) const override;
	QModelIndex doMapFromGroup(const KeyGroup &group, int column) const override;
	void doSetGroups(const std::vector<KeyGroup> &groups) override;
	QModelIndex doAddGroup(const KeyGroup &group) override;
	bool doSetGroupData(const QModelIndex &index, const KeyGroup &group) override;
	bool doRemoveGroup(const KeyGroup &group) override;

	void doClear(ItemTypes types) override
	{
	if (types & Keys) {
	mKeysByFingerprint.clear();
	}
	if (types & Groups) {
	mGroups.clear();
	}
	}

	int firstGroupRow() const
	{
	return mKeysByFingerprint.size();
	}

	int lastGroupRow() const
	{
	return mKeysByFingerprint.size() + mGroups.size() - 1;
	}

	int groupIndex(const QModelIndex &index) const
	{
	if (!index.isValid() \|\| index.row() < firstGroupRow() \|\| index.row() > lastGroupRow() \|\| index.column() >= NumColumns) {
	return -1;
	}
	return index.row() - firstGroupRow();
	}

	private:
	std::vector<Key> mKeysByFingerprint;
	std::vector<KeyGroup> mGroups;
	};

	class HierarchicalKeyListModel : public AbstractKeyListModel
	{
	Q_OBJECT
	public:
	explicit HierarchicalKeyListModel(QObject *parent = nullptr);
	~HierarchicalKeyListModel() override;

	int rowCount(const QModelIndex &pidx) const override;
	using AbstractKeyListModel::index;
	QModelIndex index(int row, int col, const QModelIndex &pidx) const override;
	QModelIndex parent(const QModelIndex &idx) const override;

	bool hasChildren(const QModelIndex &pidx) const override
	{
	return rowCount(pidx) > 0;
	}

	private:
	Key doMapToKey(const QModelIndex &index) const override;
	QModelIndex doMapFromKey(const Key &key, int col) const override;
	QList<QModelIndex> doAddKeys(const std::vector<Key> &keys) override;
	void doRemoveKey(const Key &key) override;

	KeyGroup doMapToGroup(const QModelIndex &index) const override;
	QModelIndex doMapFromGroup(const KeyGroup &group, int column) const override;
	void doSetGroups(const std::vector<KeyGroup> &groups) override;
	QModelIndex doAddGroup(const KeyGroup &group) override;
	bool doSetGroupData(const QModelIndex &index, const KeyGroup &group) override;
	bool doRemoveGroup(const KeyGroup &group) override;

	void doClear(ItemTypes types) override;

	int firstGroupRow() const
	{
	return mTopLevels.size();
	}

	int lastGroupRow() const
	{
	return mTopLevels.size() + mGroups.size() - 1;
	}

	int groupIndex(const QModelIndex &index) const
	{
	if (!index.isValid() \|\| index.row() < firstGroupRow() \|\| index.row() > lastGroupRow() \|\| index.column() >= NumColumns) {
	return -1;
	}
	return index.row() - firstGroupRow();
	}

	private:
	void addTopLevelKey(const Key &key);
	void addKeyWithParent(const char *issuer_fpr, const Key &key);
	void addKeyWithoutParent(const char *issuer_fpr, const Key &key);

	private:
	typedef std::map<std::string, std::vector<Key>> Map;
	std::vector<Key> mKeysByFingerprint; // all keys
	Map mKeysByExistingParent, mKeysByNonExistingParent; // parent->child map
	std::vector<Key> mTopLevels; // all roots + parent-less
	std::vector<KeyGroup> mGroups;
	};

	class Issuers
	{
	Issuers()
	{
	}

	public:
	static Issuers *instance()
	{
	static auto self = std::unique_ptr<Issuers>{new Issuers{}};
	return self.get();
	}

	const char *cleanChainID(const Key &key) const
	{
	const char *chainID = "";
	if (!key.isRoot()) {
	const char *const chid = key.chainID();
	if (chid && mKeysWithMaskedIssuer.find(key) == std::end(mKeysWithMaskedIssuer)) {
	chainID = chid;
	}
	}
	return chainID;
	}

	void maskIssuerOfKey(const Key &key)
	{
	mKeysWithMaskedIssuer.insert(key);
	}

	void clear()
	{
	mKeysWithMaskedIssuer.clear();
	}

	private:
	std::set<Key, _detail::ByFingerprint<std::less>> mKeysWithMaskedIssuer;
	};

	static const char *cleanChainID(const Key &key)
	{
	return Issuers::instance()->cleanChainID(key);
	}

	}

	FlatKeyListModel::FlatKeyListModel(QObject *p)
	: TableModelMixin<AbstractKeyListModel>(p)
	{
	}

	FlatKeyListModel::~FlatKeyListModel()
	{
	}

	Key FlatKeyListModel::doMapToKey(const QModelIndex &idx) const
	{
	Q_ASSERT(idx.isValid());
	if (static_cast<unsigned>(idx.row()) < mKeysByFingerprint.size() && idx.column() < NumColumns) {
	return mKeysByFingerprint[idx.row()];
	} else {
	return Key::null;
	}
	}

	QModelIndex FlatKeyListModel::doMapFromKey(const Key &key, int col) const
	{
	Q_ASSERT(!key.isNull());
	const std::vector<Key>::const_iterator it =
	std::lower_bound(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), key, _detail::ByFingerprint<std::less>());
	if (it == mKeysByFingerprint.end() \|\| !_detail::ByFingerprint<std::equal_to>()(*it, key)) {
	return {};
	} else {
	return createIndex(it - mKeysByFingerprint.begin(), col);
	}
	}

	QList<QModelIndex> FlatKeyListModel::doAddKeys(const std::vector<Key> &keys)
	{
	Q_ASSERT(std::is_sorted(keys.begin(), keys.end(), _detail::ByFingerprint<std::less>()));

	if (keys.empty()) {
	return QList<QModelIndex>();
	}

	for (auto it = keys.begin(), end = keys.end(); it != end; ++it) {
	// find an insertion point:
	const std::vector<Key>::iterator pos = std::upper_bound(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), *it, _detail::ByFingerprint<std::less>());
	const unsigned int idx = std::distance(mKeysByFingerprint.begin(), pos);

	if (idx > 0 && qstrcmp(mKeysByFingerprint[idx - 1].primaryFingerprint(), it->primaryFingerprint()) == 0) {
	// key existed before - replace with new one:
	mKeysByFingerprint[idx - 1] = *it;
	if (!modelResetInProgress()) {
	Q_EMIT dataChanged(createIndex(idx - 1, 0), createIndex(idx - 1, NumColumns - 1));
	}
	} else {
	// new key - insert:
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), idx, idx);
	}
	mKeysByFingerprint.insert(pos, *it);
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	}
	}

	return indexes(keys);
	}

	void FlatKeyListModel::doRemoveKey(const Key &key)
	{
	const std::vector<Key>::iterator it = Kleo::binary_find(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), key, _detail::ByFingerprint<std::less>());
	if (it == mKeysByFingerprint.end()) {
	return;
	}

	const unsigned int row = std::distance(mKeysByFingerprint.begin(), it);
	if (!modelResetInProgress()) {
	beginRemoveRows(QModelIndex(), row, row);
	}
	mKeysByFingerprint.erase(it);
	if (!modelResetInProgress()) {
	endRemoveRows();
	}
	}

	KeyGroup FlatKeyListModel::doMapToGroup(const QModelIndex &idx) const
	{
	Q_ASSERT(idx.isValid());
	if (static_cast<unsigned>(idx.row()) >= mKeysByFingerprint.size() && static_cast<unsigned>(idx.row()) < mKeysByFingerprint.size() + mGroups.size()
	&& idx.column() < NumColumns) {
	return mGroups[idx.row() - mKeysByFingerprint.size()];
	} else {
	return KeyGroup();
	}
	}

	QModelIndex FlatKeyListModel::doMapFromGroup(const KeyGroup &group, int column) const
	{
	Q_ASSERT(!group.isNull());
	const auto it = std::find_if(mGroups.cbegin(), mGroups.cend(), [group](const KeyGroup &g) {
	return g.source() == group.source() && g.id() == group.id();
	});
	if (it == mGroups.cend()) {
	return QModelIndex();
	} else {
	return createIndex(it - mGroups.cbegin() + mKeysByFingerprint.size(), column);
	}
	}

	void FlatKeyListModel::doSetGroups(const std::vector<KeyGroup> &groups)
	{
	Q_ASSERT(mGroups.empty()); // ensure that groups have been cleared
	const int first = mKeysByFingerprint.size();
	const int last = first + groups.size() - 1;
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), first, last);
	}
	mGroups = groups;
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	}

	QModelIndex FlatKeyListModel::doAddGroup(const KeyGroup &group)
	{
	const int newRow = lastGroupRow() + 1;
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), newRow, newRow);
	}
	mGroups.push_back(group);
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	return createIndex(newRow, 0);
	}

	bool FlatKeyListModel::doSetGroupData(const QModelIndex &index, const KeyGroup &group)
	{
	if (group.isNull()) {
	return false;
	}
	const int groupIndex = this->groupIndex(index);
	if (groupIndex == -1) {
	return false;
	}
	mGroups[groupIndex] = group;
	if (!modelResetInProgress()) {
	Q_EMIT dataChanged(createIndex(index.row(), 0), createIndex(index.row(), NumColumns - 1));
	}
	return true;
	}

	bool FlatKeyListModel::doRemoveGroup(const KeyGroup &group)
	{
	const QModelIndex modelIndex = doMapFromGroup(group, 0);
	if (!modelIndex.isValid()) {
	return false;
	}
	const int groupIndex = this->groupIndex(modelIndex);
	Q_ASSERT(groupIndex != -1);
	if (groupIndex == -1) {
	return false;
	}
	if (!modelResetInProgress()) {
	beginRemoveRows(QModelIndex(), modelIndex.row(), modelIndex.row());
	}
	mGroups.erase(mGroups.begin() + groupIndex);
	if (!modelResetInProgress()) {
	endRemoveRows();
	}
	return true;
	}

	HierarchicalKeyListModel::HierarchicalKeyListModel(QObject *p)
	: AbstractKeyListModel(p)
	, mKeysByFingerprint()
	, mKeysByExistingParent()
	, mKeysByNonExistingParent()
	, mTopLevels()
	{
	}

	HierarchicalKeyListModel::~HierarchicalKeyListModel()
	{
	}

	int HierarchicalKeyListModel::rowCount(const QModelIndex &pidx) const
	{
	// toplevel item:
	if (!pidx.isValid()) {
	return mTopLevels.size() + mGroups.size();
	}

	if (pidx.column() != 0) {
	return 0;
	}

	// non-toplevel item - find the number of subjects for this issuer:
	const Key issuer = this->key(pidx);
	const char *const fpr = issuer.primaryFingerprint();
	if (!fpr \|\| !*fpr) {
	return 0;
	}
	const Map::const_iterator it = mKeysByExistingParent.find(fpr);
	if (it == mKeysByExistingParent.end()) {
	return 0;
	}
	return it->second.size();
	}

	QModelIndex HierarchicalKeyListModel::index(int row, int col, const QModelIndex &pidx) const
	{
	if (row < 0 \|\| col < 0 \|\| col >= NumColumns) {
	return {};
	}

	// toplevel item:
	if (!pidx.isValid()) {
	if (static_cast<unsigned>(row) < mTopLevels.size()) {
	return index(mTopLevels[row], col);
	} else if (static_cast<unsigned>(row) < mTopLevels.size() + mGroups.size()) {
	return index(mGroups[row - mTopLevels.size()], col);
	} else {
	return QModelIndex();
	}
	}

	// non-toplevel item - find the row'th subject of this key:
	const Key issuer = this->key(pidx);
	const char *const fpr = issuer.primaryFingerprint();
	if (!fpr \|\| !*fpr) {
	return QModelIndex();
	}
	const Map::const_iterator it = mKeysByExistingParent.find(fpr);
	if (it == mKeysByExistingParent.end() \|\| static_cast<unsigned>(row) >= it->second.size()) {
	return QModelIndex();
	}
	return index(it->second[row], col);
	}

	QModelIndex HierarchicalKeyListModel::parent(const QModelIndex &idx) const
	{
	const Key key = this->key(idx);
	if (key.isNull() \|\| key.isRoot()) {
	return {};
	}
	const std::vector<Key>::const_iterator it =
	Kleo::binary_find(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), cleanChainID(key), _detail::ByFingerprint<std::less>());
	return it != mKeysByFingerprint.end() ? index(*it) : QModelIndex();
	}

	Key HierarchicalKeyListModel::doMapToKey(const QModelIndex &idx) const
	{
	Key key = Key::null;

	if (idx.isValid()) {
	const char const issuer_fpr = static_cast<const char >(idx.internalPointer());
	if (!issuer_fpr \|\| !*issuer_fpr) {
	// top-level:
	if (static_cast<unsigned>(idx.row()) < mTopLevels.size()) {
	key = mTopLevels[idx.row()];
	}
	} else {
	// non-toplevel:
	const Map::const_iterator it = mKeysByExistingParent.find(issuer_fpr);
	if (it != mKeysByExistingParent.end() && static_cast<unsigned>(idx.row()) < it->second.size()) {
	key = it->second[idx.row()];
	}
	}
	}

	return key;
	}

	QModelIndex HierarchicalKeyListModel::doMapFromKey(const Key &key, int col) const
	{
	if (key.isNull()) {
	return {};
	}

	const char *issuer_fpr = cleanChainID(key);

	// we need to look in the toplevels list,...
	const std::vector<Key> *v = &mTopLevels;
	if (issuer_fpr && *issuer_fpr) {
	const std::map<std::string, std::vector<Key>>::const_iterator it = mKeysByExistingParent.find(issuer_fpr);
	// ...unless we find an existing parent:
	if (it != mKeysByExistingParent.end()) {
	v = &it->second;
	} else {
	issuer_fpr = nullptr; // force internalPointer to zero for toplevels
	}
	}

	const std::vector<Key>::const_iterator it = std::lower_bound(v->begin(), v->end(), key, _detail::ByFingerprint<std::less>());
	if (it == v->end() \|\| !_detail::ByFingerprint<std::equal_to>()(*it, key)) {
	return QModelIndex();
	}

	const unsigned int row = std::distance(v->begin(), it);
	return createIndex(row, col, const_cast<char * /* thanks, Trolls :/ */>(issuer_fpr));
	}

	void HierarchicalKeyListModel::addKeyWithParent(const char *issuer_fpr, const Key &key)
	{
	Q_ASSERT(issuer_fpr);
	Q_ASSERT(*issuer_fpr);
	Q_ASSERT(!key.isNull());

	std::vector<Key> &subjects = mKeysByExistingParent[issuer_fpr];

	// find insertion point:
	const std::vector<Key>::iterator it = std::lower_bound(subjects.begin(), subjects.end(), key, _detail::ByFingerprint<std::less>());
	const int row = std::distance(subjects.begin(), it);

	if (it != subjects.end() && qstricmp(it->primaryFingerprint(), key.primaryFingerprint()) == 0) {
	// exists -> replace
	*it = key;
	if (!modelResetInProgress()) {
	Q_EMIT dataChanged(createIndex(row, 0, const_cast<char >(issuer_fpr)), createIndex(row, NumColumns - 1, const_cast<char >(issuer_fpr)));
	}
	} else {
	// doesn't exist -> insert
	const std::vector<Key>::const_iterator pos =
	Kleo::binary_find(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), issuer_fpr, _detail::ByFingerprint<std::less>());
	Q_ASSERT(pos != mKeysByFingerprint.end());
	if (!modelResetInProgress()) {
	beginInsertRows(index(*pos), row, row);
	}
	subjects.insert(it, key);
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	}
	}

	void HierarchicalKeyListModel::addKeyWithoutParent(const char *issuer_fpr, const Key &key)
	{
	Q_ASSERT(issuer_fpr);
	Q_ASSERT(*issuer_fpr);
	Q_ASSERT(!key.isNull());

	std::vector<Key> &subjects = mKeysByNonExistingParent[issuer_fpr];

	// find insertion point:
	const std::vector<Key>::iterator it = std::lower_bound(subjects.begin(), subjects.end(), key, _detail::ByFingerprint<std::less>());

	if (it != subjects.end() && qstricmp(it->primaryFingerprint(), key.primaryFingerprint()) == 0) {
	// exists -> replace
	*it = key;
	} else {
	// doesn't exist -> insert
	subjects.insert(it, key);
	}

	addTopLevelKey(key);
	}

	void HierarchicalKeyListModel::addTopLevelKey(const Key &key)
	{
	// find insertion point:
	const std::vector<Key>::iterator it = std::lower_bound(mTopLevels.begin(), mTopLevels.end(), key, _detail::ByFingerprint<std::less>());
	const int row = std::distance(mTopLevels.begin(), it);

	if (it != mTopLevels.end() && qstricmp(it->primaryFingerprint(), key.primaryFingerprint()) == 0) {
	// exists -> replace
	*it = key;
	if (!modelResetInProgress()) {
	Q_EMIT dataChanged(createIndex(row, 0), createIndex(row, NumColumns - 1));
	}
	} else {
	// doesn't exist -> insert
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), row, row);
	}
	mTopLevels.insert(it, key);
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	}
	}

	namespace
	{

	// based on https://www.boost.org/doc/libs/1_77_0/libs/graph/doc/file_dependency_example.html#sec:cycles
	struct cycle_detector : public boost::dfs_visitor<> {
	cycle_detector(bool &has_cycle)
	: _has_cycle{has_cycle}
	{
	}

	template<class Edge, class Graph>
	void back_edge(Edge, Graph &)
	{
	_has_cycle = true;
	}

	private:
	bool &_has_cycle;
	};

	static bool graph_has_cycle(const boost::adjacency_list<> &graph)
	{
	bool cycle_found = false;
	cycle_detector vis{cycle_found};
	boost::depth_first_search(graph, visitor(vis));
	return cycle_found;
	}

	static void find_keys_causing_cycles_and_mask_their_issuers(const std::vector<Key> &keys)
	{
	boost::adjacency_list<> graph{keys.size()};

	for (unsigned int i = 0, end = keys.size(); i != end; ++i) {
	const auto &key = keys[i];
	const char *const issuer_fpr = cleanChainID(key);
	if (!issuer_fpr \|\| !*issuer_fpr) {
	continue;
	}
	const std::vector<Key>::const_iterator it = Kleo::binary_find(keys.begin(), keys.end(), issuer_fpr, _detail::ByFingerprint<std::less>());
	if (it == keys.end()) {
	continue;
	}
	const auto j = std::distance(keys.begin(), it);
	const auto edge = boost::add_edge(i, j, graph).first;
	if (graph_has_cycle(graph)) {
	Issuers::instance()->maskIssuerOfKey(key);
	boost::remove_edge(edge, graph);
	}
	}
	}

	static auto build_key_graph(const std::vector<Key> &keys)
	{
	boost::adjacency_list<> graph(keys.size());

	// add edges from children to parents:
	for (unsigned int i = 0, end = keys.size(); i != end; ++i) {
	const char *const issuer_fpr = cleanChainID(keys[i]);
	if (!issuer_fpr \|\| !*issuer_fpr) {
	continue;
	}
	const std::vector<Key>::const_iterator it = Kleo::binary_find(keys.begin(), keys.end(), issuer_fpr, _detail::ByFingerprint<std::less>());
	if (it == keys.end()) {
	continue;
	}
	const auto j = std::distance(keys.begin(), it);
	add_edge(i, j, graph);
	}

	return graph;
	}

	// sorts 'keys' such that parent always come before their children:
	static std::vector<Key> topological_sort(const std::vector<Key> &keys)
	{
	const auto graph = build_key_graph(keys);

	std::vector<int> order;
	order.reserve(keys.size());
	topological_sort(graph, std::back_inserter(order));

	Q_ASSERT(order.size() == keys.size());

	std::vector<Key> result;
	result.reserve(keys.size());
	for (int i : std::as_const(order)) {
	result.push_back(keys[i]);
	}
	return result;
	}

	}

	QList<QModelIndex> HierarchicalKeyListModel::doAddKeys(const std::vector<Key> &keys)
	{
	Q_ASSERT(std::is_sorted(keys.begin(), keys.end(), _detail::ByFingerprint<std::less>()));

	if (keys.empty()) {
	return QList<QModelIndex>();
	}

	const std::vector<Key> oldKeys = mKeysByFingerprint;

	std::vector<Key> merged;
	merged.reserve(keys.size() + mKeysByFingerprint.size());
	std::set_union(keys.begin(),
	keys.end(),
	mKeysByFingerprint.begin(),
	mKeysByFingerprint.end(),
	std::back_inserter(merged),
	_detail::ByFingerprint<std::less>());

	mKeysByFingerprint = merged;

	if (graph_has_cycle(build_key_graph(mKeysByFingerprint))) {
	find_keys_causing_cycles_and_mask_their_issuers(mKeysByFingerprint);
	}

	std::set<Key, _detail::ByFingerprint<std::less>> changedParents;

	const auto topologicalSortedList = topological_sort(keys);
	for (const Key &key : topologicalSortedList) {
	// check to see whether this key is a parent for a previously parent-less group:
	const char *const fpr = key.primaryFingerprint();
	if (!fpr \|\| !*fpr) {
	continue;
	}

	const bool keyAlreadyExisted = std::binary_search(oldKeys.begin(), oldKeys.end(), key, _detail::ByFingerprint<std::less>());

	const Map::iterator it = mKeysByNonExistingParent.find(fpr);
	const std::vector<Key> children = it != mKeysByNonExistingParent.end() ? it->second : std::vector<Key>();
	if (it != mKeysByNonExistingParent.end()) {
	mKeysByNonExistingParent.erase(it);
	}

	// Step 1: For new keys, remove children from toplevel:

	if (!keyAlreadyExisted) {
	auto last = mTopLevels.begin();
	auto lastFP = mKeysByFingerprint.begin();

	for (const Key &k : children) {
	last = Kleo::binary_find(last, mTopLevels.end(), k, _detail::ByFingerprint<std::less>());
	Q_ASSERT(last != mTopLevels.end());
	const int row = std::distance(mTopLevels.begin(), last);

	lastFP = Kleo::binary_find(lastFP, mKeysByFingerprint.end(), k, _detail::ByFingerprint<std::less>());
	Q_ASSERT(lastFP != mKeysByFingerprint.end());

	Q_EMIT rowAboutToBeMoved(QModelIndex(), row);
	if (!modelResetInProgress()) {
	beginRemoveRows(QModelIndex(), row, row);
	}
	last = mTopLevels.erase(last);
	lastFP = mKeysByFingerprint.erase(lastFP);
	if (!modelResetInProgress()) {
	endRemoveRows();
	}
	}
	}
	// Step 2: add/update key

	const char *const issuer_fpr = cleanChainID(key);
	if (!issuer_fpr \|\| !*issuer_fpr) {
	// root or something...
	addTopLevelKey(key);
	} else if (std::binary_search(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), issuer_fpr, _detail::ByFingerprint<std::less>())) {
	// parent exists...
	addKeyWithParent(issuer_fpr, key);
	} else {
	// parent doesn't exist yet...
	addKeyWithoutParent(issuer_fpr, key);
	}

	const QModelIndex key_idx = index(key);
	QModelIndex key_parent = key_idx.parent();
	while (key_parent.isValid()) {
	changedParents.insert(doMapToKey(key_parent));
	key_parent = key_parent.parent();
	}

	// Step 3: Add children to new parent ( == key )

	if (!keyAlreadyExisted && !children.empty()) {
	addKeys(children);
	const QModelIndex new_parent = index(key);
	// Q_EMIT the rowMoved() signals in reversed direction, so the
	// implementation can use a stack for mapping.
	for (int i = children.size() - 1; i >= 0; --i) {
	Q_EMIT rowMoved(new_parent, i);
	}
	}
	}
	// Q_EMIT dataChanged for all parents with new children. This triggers KeyListSortFilterProxyModel to
	// show a parent node if it just got children matching the proxy's filter
	if (!modelResetInProgress()) {
	for (const Key &i : std::as_const(changedParents)) {
	const QModelIndex idx = index(i);
	if (idx.isValid()) {
	Q_EMIT dataChanged(idx.sibling(idx.row(), 0), idx.sibling(idx.row(), NumColumns - 1));
	}
	}
	}
	return indexes(keys);
	}

	void HierarchicalKeyListModel::doRemoveKey(const Key &key)
	{
	const QModelIndex idx = index(key);
	if (!idx.isValid()) {
	return;
	}

	const char *const fpr = key.primaryFingerprint();
	if (mKeysByExistingParent.find(fpr) != mKeysByExistingParent.end()) {
	// handle non-leave nodes:
	std::vector<Key> keys = mKeysByFingerprint;
	const std::vector<Key>::iterator it = Kleo::binary_find(keys.begin(), keys.end(), key, _detail::ByFingerprint<std::less>());
	if (it == keys.end()) {
	return;
	}
	keys.erase(it);
	// FIXME for simplicity, we just clear the model and re-add all keys minus the removed one. This is suboptimal,
	// but acceptable given that deletion of non-leave nodes is rather rare.
	clear(Keys);
	addKeys(keys);
	return;
	}

	// handle leave nodes:

	const std::vector<Key>::iterator it = Kleo::binary_find(mKeysByFingerprint.begin(), mKeysByFingerprint.end(), key, _detail::ByFingerprint<std::less>());

	Q_ASSERT(it != mKeysByFingerprint.end());
	Q_ASSERT(mKeysByNonExistingParent.find(fpr) == mKeysByNonExistingParent.end());
	Q_ASSERT(mKeysByExistingParent.find(fpr) == mKeysByExistingParent.end());

	if (!modelResetInProgress()) {
	beginRemoveRows(parent(idx), idx.row(), idx.row());
	}
	mKeysByFingerprint.erase(it);

	const char *const issuer_fpr = cleanChainID(key);

	const std::vector<Key>::iterator tlIt = Kleo::binary_find(mTopLevels.begin(), mTopLevels.end(), key, _detail::ByFingerprint<std::less>());
	if (tlIt != mTopLevels.end()) {
	mTopLevels.erase(tlIt);
	}

	if (issuer_fpr && *issuer_fpr) {
	const Map::iterator nexIt = mKeysByNonExistingParent.find(issuer_fpr);
	if (nexIt != mKeysByNonExistingParent.end()) {
	const std::vector<Key>::iterator eit = Kleo::binary_find(nexIt->second.begin(), nexIt->second.end(), key, _detail::ByFingerprint<std::less>());
	if (eit != nexIt->second.end()) {
	nexIt->second.erase(eit);
	}
	if (nexIt->second.empty()) {
	mKeysByNonExistingParent.erase(nexIt);
	}
	}

	const Map::iterator exIt = mKeysByExistingParent.find(issuer_fpr);
	if (exIt != mKeysByExistingParent.end()) {
	const std::vector<Key>::iterator eit = Kleo::binary_find(exIt->second.begin(), exIt->second.end(), key, _detail::ByFingerprint<std::less>());
	if (eit != exIt->second.end()) {
	exIt->second.erase(eit);
	}
	if (exIt->second.empty()) {
	mKeysByExistingParent.erase(exIt);
	}
	}
	}
	if (!modelResetInProgress()) {
	endRemoveRows();
	}
	}

	KeyGroup HierarchicalKeyListModel::doMapToGroup(const QModelIndex &idx) const
	{
	Q_ASSERT(idx.isValid());
	if (idx.parent().isValid()) {
	// groups are always top-level
	return KeyGroup();
	}

	if (static_cast<unsigned>(idx.row()) >= mTopLevels.size() && static_cast<unsigned>(idx.row()) < mTopLevels.size() + mGroups.size()
	&& idx.column() < NumColumns) {
	return mGroups[idx.row() - mTopLevels.size()];
	} else {
	return KeyGroup();
	}
	}

	QModelIndex HierarchicalKeyListModel::doMapFromGroup(const KeyGroup &group, int column) const
	{
	Q_ASSERT(!group.isNull());
	const auto it = std::find_if(mGroups.cbegin(), mGroups.cend(), [group](const KeyGroup &g) {
	return g.source() == group.source() && g.id() == group.id();
	});
	if (it == mGroups.cend()) {
	return QModelIndex();
	} else {
	return createIndex(it - mGroups.cbegin() + mTopLevels.size(), column);
	}
	}

	void HierarchicalKeyListModel::doSetGroups(const std::vector<KeyGroup> &groups)
	{
	Q_ASSERT(mGroups.empty()); // ensure that groups have been cleared
	const int first = mTopLevels.size();
	const int last = first + groups.size() - 1;
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), first, last);
	}
	mGroups = groups;
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	}

	QModelIndex HierarchicalKeyListModel::doAddGroup(const KeyGroup &group)
	{
	const int newRow = lastGroupRow() + 1;
	if (!modelResetInProgress()) {
	beginInsertRows(QModelIndex(), newRow, newRow);
	}
	mGroups.push_back(group);
	if (!modelResetInProgress()) {
	endInsertRows();
	}
	return createIndex(newRow, 0);
	}

	bool HierarchicalKeyListModel::doSetGroupData(const QModelIndex &index, const KeyGroup &group)
	{
	if (group.isNull()) {
	return false;
	}
	const int groupIndex = this->groupIndex(index);
	if (groupIndex == -1) {
	return false;
	}
	mGroups[groupIndex] = group;
	if (!modelResetInProgress()) {
	Q_EMIT dataChanged(createIndex(index.row(), 0), createIndex(index.row(), NumColumns - 1));
	}
	return true;
	}

	bool HierarchicalKeyListModel::doRemoveGroup(const KeyGroup &group)
	{
	const QModelIndex modelIndex = doMapFromGroup(group, 0);
	if (!modelIndex.isValid()) {
	return false;
	}
	const int groupIndex = this->groupIndex(modelIndex);
	Q_ASSERT(groupIndex != -1);
	if (groupIndex == -1) {
	return false;
	}
	if (!modelResetInProgress()) {
	beginRemoveRows(QModelIndex(), modelIndex.row(), modelIndex.row());
	}
	mGroups.erase(mGroups.begin() + groupIndex);
	if (!modelResetInProgress()) {
	endRemoveRows();
	}
	return true;
	}

	void HierarchicalKeyListModel::doClear(ItemTypes types)
	{
	if (types & Keys) {
	mTopLevels.clear();
	mKeysByFingerprint.clear();
	mKeysByExistingParent.clear();
	mKeysByNonExistingParent.clear();
	Issuers::instance()->clear();
	}
	if (types & Groups) {
	mGroups.clear();
	}
	}

	void AbstractKeyListModel::useKeyCache(bool value, KeyList::Options options)
	{
	d->m_keyListOptions = options;
	d->m_useKeyCache = value;
	if (!d->m_useKeyCache) {
	clear(All);
	} else {
	d->updateFromKeyCache();
	}
	connect(KeyCache::instance().get(), &KeyCache::keysMayHaveChanged, this, [this] {
	d->updateFromKeyCache();
	});
	}

	// static
	AbstractKeyListModel AbstractKeyListModel::createFlatKeyListModel(QObject p)
	{
	AbstractKeyListModel *const m = new FlatKeyListModel(p);
	#ifdef KLEO_MODEL_TEST
	new QAbstractItemModelTester(m, p);
	#endif
	return m;
	}

	// static
	AbstractKeyListModel AbstractKeyListModel::createHierarchicalKeyListModel(QObject p)
	{
	AbstractKeyListModel *const m = new HierarchicalKeyListModel(p);
	#ifdef KLEO_MODEL_TEST
	new QAbstractItemModelTester(m, p);
	#endif
	return m;
	}

	+QMimeData *AbstractKeyListModel::mimeData(const QModelIndexList &indexes) const
	+{
	+ if (d->m_dragHandler) {
	+ return d->m_dragHandler->mimeData(indexes);
	+ } else {
	+ return QAbstractItemModel::mimeData(indexes);
	+ }
	+}
	+
	+Qt::ItemFlags AbstractKeyListModel::flags(const QModelIndex &index) const
	+{
	+ if (d->m_dragHandler) {
	+ return d->m_dragHandler->flags(index);
	+ } else {
	+ return QAbstractItemModel::flags(index);
	+ }
	+}
	+
	+QStringList AbstractKeyListModel::mimeTypes() const
	+{
	+ if (d->m_dragHandler) {
	+ return d->m_dragHandler->mimeTypes();
	+ } else {
	+ return QAbstractItemModel::mimeTypes();
	+ }
	+}
	+
	+void AbstractKeyListModel::setDragHandler(const std::shared_ptr<DragHandler> &dragHandler)
	+{
	+ d->m_dragHandler = dragHandler;
	+}
	+
	#include "keylistmodel.moc"

	/*!
	\fn AbstractKeyListModel::rowAboutToBeMoved( const QModelIndex & old_parent, int old_row )

	Emitted before the removal of a row from that model. It will later
	be added to the model again, in response to which rowMoved() will be
	emitted. If multiple rows are moved in one go, multiple
	rowAboutToBeMoved() signals are emitted before the corresponding
	number of rowMoved() signals is emitted - in reverse order.

	This works around the absence of move semantics in
	QAbstractItemModel. Clients can maintain a stack to perform the
	QModelIndex-mapping themselves, or, e.g., to preserve the selection
	status of the row:

	\code
	std::vector<bool> mMovingRowWasSelected; // transient, used when rows are moved
	// ...
	void slotRowAboutToBeMoved( const QModelIndex & p, int row ) {
	mMovingRowWasSelected.push_back( selectionModel()->isSelected( model()->index( row, 0, p ) ) );
	}
	void slotRowMoved( const QModelIndex & p, int row ) {
	const bool wasSelected = mMovingRowWasSelected.back();
	mMovingRowWasSelected.pop_back();
	if ( wasSelected )
	selectionModel()->select( model()->index( row, 0, p ), Select\|Rows );
	}
	\endcode

	A similar mechanism could be used to preserve the current item during moves.
	*/

	/*!
	\fn AbstractKeyListModel::rowMoved( const QModelIndex & new_parent, int new_parent )

	See rowAboutToBeMoved()
	*/

	#include "moc_keylistmodel.cpp"
	diff --git a/src/models/keylistmodel.h b/src/models/keylistmodel.h
	index cc6421c2..bcf6d16f 100644
	--- a/src/models/keylistmodel.h
	+++ b/src/models/keylistmodel.h
	@@ -1,132 +1,149 @@
	/* -- mode: c++; c-basic-offset:4 --
	models/keylistmodel.h

	This file is part of libkleopatra, the KDE keymanagement library
	SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
	SPDX-FileCopyrightText: 2021 g10 Code GmbH
	SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>

	SPDX-License-Identifier: GPL-2.0-or-later
	*/

	#pragma once

	#include "keylist.h"
	#include "keylistmodelinterface.h"
	#include "kleo_export.h"

	#include <Libkleo/KeyGroup>

	#include <QAbstractItemModel>

	#include <vector>

	namespace GpgME
	{
	class Key;
	}

	namespace Kleo
	{

	+class KLEO_EXPORT DragHandler
	+{
	+public:
	+ virtual ~DragHandler()
	+ {
	+ }
	+ virtual QMimeData *mimeData(const QModelIndexList &indexes) const = 0;
	+ virtual Qt::ItemFlags flags(const QModelIndex &index) const = 0;
	+ virtual QStringList mimeTypes() const = 0;
	+};
	+
	class KLEO_EXPORT AbstractKeyListModel : public QAbstractItemModel, public KeyListModelInterface
	{
	Q_OBJECT
	public:
	enum ItemType {
	// clang-format off
	Keys = 0x01,
	Groups = 0x02,
	All = Keys \| Groups,
	// clang-format on
	};
	Q_DECLARE_FLAGS(ItemTypes, ItemType)

	explicit AbstractKeyListModel(QObject *parent = nullptr);
	~AbstractKeyListModel() override;

	static AbstractKeyListModel createFlatKeyListModel(QObject parent = nullptr);
	static AbstractKeyListModel createHierarchicalKeyListModel(QObject parent = nullptr);

	GpgME::Key key(const QModelIndex &idx) const override;
	std::vector<GpgME::Key> keys(const QList<QModelIndex> &indexes) const override;

	KeyGroup group(const QModelIndex &idx) const override;

	using QAbstractItemModel::index;
	QModelIndex index(const GpgME::Key &key) const override;
	QModelIndex index(const GpgME::Key &key, int col) const;
	QList<QModelIndex> indexes(const std::vector<GpgME::Key> &keys) const override;

	QModelIndex index(const KeyGroup &group) const override;
	QModelIndex index(const KeyGroup &group, int col) const;

	+ void setDragHandler(const std::shared_ptr<DragHandler>& dragHandler);
	+
	Q_SIGNALS:
	void rowAboutToBeMoved(const QModelIndex &old_parent, int old_row);
	void rowMoved(const QModelIndex &new_parent, int new_row);

	public Q_SLOTS:
	void setKeys(const std::vector<GpgME::Key> &keys);
	/* Set this to set all or only secret keys from the keycache. */
	void useKeyCache(bool value, Kleo::KeyList::Options options);
	QModelIndex addKey(const GpgME::Key &key);
	QList<QModelIndex> addKeys(const std::vector<GpgME::Key> &keys);
	void removeKey(const GpgME::Key &key);

	void setGroups(const std::vector<KeyGroup> &groups);
	QModelIndex addGroup(const Kleo::KeyGroup &group);
	bool removeGroup(const Kleo::KeyGroup &group);

	void clear(Kleo::AbstractKeyListModel::ItemTypes types = All);

	public:
	int columnCount(const QModelIndex &pidx) const override;
	QVariant headerData(int section, Qt::Orientation o, int role = Qt::DisplayRole) const override;
	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
	bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;

	/**
	* defines which information is displayed in tooltips
	* see Kleo::Formatting::ToolTipOption
	*/
	int toolTipOptions() const;

	void setToolTipOptions(int opts);

	/**
	* Set the keys to use for KeyListModelInterface::Remark column
	* to obtain remarks from this keys signature notations.
	* Needs at least GpgME 1.14 to work properly. Remarks are
	* joined by a semicolon and a space. */
	void setRemarkKeys(const std::vector<GpgME::Key> &remarkKeys);
	std::vector<GpgME::Key> remarkKeys() const;

	+ Qt::ItemFlags flags(const QModelIndex &index) const override;
	+ QStringList mimeTypes() const override;
	+ QMimeData *mimeData(const QModelIndexList &indexes) const override;
	+
	protected:
	bool modelResetInProgress();

	private:
	QVariant data(const GpgME::Key &key, int column, int role) const;
	QVariant data(const KeyGroup &group, int column, int role) const;

	virtual GpgME::Key doMapToKey(const QModelIndex &index) const = 0;
	virtual QModelIndex doMapFromKey(const GpgME::Key &key, int column) const = 0;
	virtual QList<QModelIndex> doAddKeys(const std::vector<GpgME::Key> &keys) = 0;
	virtual void doRemoveKey(const GpgME::Key &key) = 0;

	virtual KeyGroup doMapToGroup(const QModelIndex &index) const = 0;
	virtual QModelIndex doMapFromGroup(const KeyGroup &group, int column) const = 0;
	virtual void doSetGroups(const std::vector<KeyGroup> &groups) = 0;
	virtual QModelIndex doAddGroup(const KeyGroup &group) = 0;
	virtual bool doSetGroupData(const QModelIndex &index, const KeyGroup &group) = 0;
	virtual bool doRemoveGroup(const KeyGroup &group) = 0;

	virtual void doClear(ItemTypes types) = 0;

	private:
	class Private;
	QScopedPointer<Private> const d;
	};

	}

	Q_DECLARE_OPERATORS_FOR_FLAGS(Kleo::AbstractKeyListModel::ItemTypes)

File Metadata

Mime Type: text/x-diff
Expires: Sun, Dec 14, 3:08 PM (1 d, 10 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 44/f2/c99e388d19652ef86868eb609832

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions