Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Hack: consider ikey_trusted keys as trusted

Browse source
This commit is contained in:
Paul Schaub 2021-03-29 13:43:45 +02:00
parent 77f4273c3a
commit 171f916df2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
View file

@ -152,10 +152,13 @@ public class OpenPgpContact {
while (iterator.hasNext()) { while (iterator.hasNext()) {
PGPPublicKeyRing ring = iterator.next(); PGPPublicKeyRing ring = iterator.next();
OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint(ring); OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint(ring);
if (store.getTrust(getJid(), fingerprint) != trust) { if (trust == OpenPgpTrustStore.Trust.trusted) {
OpenPgpTrustStore.Trust fingerprintTrust = store.getTrust(getJid(), fingerprint);
if (fingerprintTrust != OpenPgpTrustStore.Trust.trusted && fingerprintTrust != OpenPgpTrustStore.Trust.ikey_trusted) {
toRemove.add(ring); toRemove.add(ring);
} }
} }
}
for (PGPPublicKeyRing ring : toRemove) { for (PGPPublicKeyRing ring : toRemove) {
keys = PGPPublicKeyRingCollection.removePublicKeyRing(keys, ring); keys = PGPPublicKeyRingCollection.removePublicKeyRing(keys, ring);