From fb2fa195bfff709af23d1394a3ff739ebc2d0ddd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 24 Jan 2015 23:11:54 +0100
Subject: allow explicit re-certification in SaveKeyringParcel

---
 .../java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java  | 2 +-
 .../org/sufficientlysecure/keychain/service/SaveKeyringParcel.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain')

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 4cf5fc459..928a0f96b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -730,7 +730,7 @@ public class PgpKeyOperation {
                 }
 
                 // This doesn't concern us any further
-                if (change.mExpiry == null && change.mFlags == null) {
+                if (!change.mRecertify && (change.mExpiry == null && change.mFlags == null)) {
                     continue;
                 }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index b8ee750b7..a8823cd5c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -118,11 +118,18 @@ public class SaveKeyringParcel implements Parcelable {
         public boolean mDummyStrip;
         // if this flag is true, the subkey should be changed to a divert-to-card key
         public boolean mDummyDivert;
+        // if this flag is true, the key will be recertified even if the above values are no-ops
+        public boolean mRecertify;
 
         public SubkeyChange(long keyId) {
             mKeyId = keyId;
         }
 
+        public SubkeyChange(long keyId, boolean recertify) {
+            mKeyId = keyId;
+            mRecertify = recertify;
+        }
+
         public SubkeyChange(long keyId, Integer flags, Long expiry) {
             mKeyId = keyId;
             mFlags = flags;
-- 
cgit v1.2.3