From 6a3150d8788664a5e1d501488159ff5e080cb9b4 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 19 Aug 2014 14:42:40 +0200
Subject: [PATCH] fix primary user id in master key flag modification

---
 .../org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index c69eeaf04..88c6437d3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -881,10 +881,12 @@ public class PgpKeyOperation {
             }
 
             // add shiny new user id certificate
+            boolean isPrimary = currentCert.getHashedSubPackets() != null &&
+                    currentCert.getHashedSubPackets().isPrimaryUserID();
             modifiedPublicKey = PGPPublicKey.removeCertification(
                     modifiedPublicKey, userId, currentCert);
             PGPSignature newCert = generateUserIdSignature(
-                    masterPrivateKey, masterPublicKey, userId, true, flags, expiry);
+                    masterPrivateKey, masterPublicKey, userId, isPrimary, flags, expiry);
             modifiedPublicKey = PGPPublicKey.addCertification(
                     modifiedPublicKey, userId, newCert);
             ok = true;