From d3746b89e55581a478fa140c37266b21d2e79875 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 29 Aug 2017 01:46:08 +0200
Subject: [PATCH] respect most recent sig with actual key flags, if available

---
 .../sufficientlysecure/keychain/pgp/UncachedPublicKey.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
index 4305d8a12..977ddff07 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
@@ -344,6 +344,12 @@ public class UncachedPublicKey {
                     continue;
                 }
 
+                // Previous signature had key flags, but new one doesn't
+                if (!sig.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.KEY_FLAGS)
+                        && mostRecentSig.getHashedSubPackets().hasSubpacket(SignatureSubpacketTags.KEY_FLAGS)) {
+                    continue;
+                }
+
                 // Otherwise, note it down as the new "most recent" one
                 mostRecentSig = sig;
             }