Commit aeb2f056 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Revert "Add possibility to filter out invalid keys"

This reverts commit c2163f1b.

The commit depends on features from gpgme newer than the currently
required 1.11.1.

CCMAIL: dev@ingo-kloecker.de
parent d1c0aff5
Pipeline #39625 canceled with stage
......@@ -47,7 +47,6 @@ public:
mIsOpenPGP(DoesNotMatter),
mWasValidated(DoesNotMatter),
mIsDeVs(DoesNotMatter),
mBad(DoesNotMatter),
mOwnerTrust(LevelDoesNotMatter),
mOwnerTrustReferenceLevel(Key::Unknown),
mValidity(LevelDoesNotMatter),
......@@ -79,7 +78,6 @@ public:
TriState mIsOpenPGP;
TriState mWasValidated;
TriState mIsDeVs;
TriState mBad;
LevelState mOwnerTrust;
GpgME::Key::OwnerTrust mOwnerTrustReferenceLevel;
......@@ -124,7 +122,6 @@ bool DefaultKeyFilter::matches(const Key &key, MatchContexts contexts) const
return false;
}
MATCH(d_ptr->mHasSecret, hasSecret);
IS_MATCH(Bad);
#undef MATCH
if (d_ptr->mIsOpenPGP != DoesNotMatter &&
bool(key.protocol() == GpgME::OpenPGP) != bool(d_ptr->mIsOpenPGP == Set)) {
......@@ -351,11 +348,6 @@ void DefaultKeyFilter::setIsDeVs(DefaultKeyFilter::TriState value) const
d_ptr->mIsDeVs = value;
}
void DefaultKeyFilter::setIsBad(DefaultKeyFilter::TriState value) const
{
d_ptr->mBad = value;
}
QColor DefaultKeyFilter::fgColor() const
{
return d_ptr->mFgColor;
......@@ -505,8 +497,3 @@ DefaultKeyFilter::TriState DefaultKeyFilter::isDeVS() const
{
return d_ptr->mIsDeVs;
}
DefaultKeyFilter::TriState DefaultKeyFilter::isBad() const
{
return d_ptr->mBad;
}
......@@ -87,7 +87,6 @@ public:
TriState isOpenPGP() const;
TriState wasValidated() const;
TriState isDeVS() const;
TriState isBad() const;
LevelState ownerTrust() const;
GpgME::Key::OwnerTrust ownerTrustReferenceLevel() const;
......@@ -113,7 +112,6 @@ public:
void setIsOpenPGP(const TriState) const;
void setWasValidated(const TriState) const;
void setIsDeVs(const TriState) const;
void setIsBad(const TriState) const;
void setOwnerTrust(const LevelState) const;
void setOwnerTrustReferenceLevel(const GpgME::Key::OwnerTrust) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment