1 files changed, 5 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 3ec6fd2a8..6d1200a92 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -27,6 +27,7 @@ import java.security.SecureRandom;
 import java.security.SignatureException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 import org.spongycastle.bcpg.CompressionAlgorithmTags;
 import org.spongycastle.bcpg.HashAlgorithmTags;
@@ -242,7 +243,8 @@ public class PgpKeyOperation {
     }
 
     public void buildSecretKey(ArrayList<String> userIds, ArrayList<PGPSecretKey> keys,
-            ArrayList<Integer> keysUsages, long masterKeyId, String oldPassPhrase,
+            ArrayList<Integer> keysUsages, ArrayList<GregorianCalendar> keysExpiryDates,
+            long masterKeyId, String oldPassPhrase,
             String newPassPhrase) throws PgpGeneralException, NoSuchProviderException,
             PGPException, NoSuchAlgorithmException, SignatureException, IOException {
 
@@ -320,6 +322,8 @@ public class PgpKeyOperation {
         hashedPacketsGen.setPreferredHashAlgorithms(true, PREFERRED_HASH_ALGORITHMS);
         hashedPacketsGen.setPreferredCompressionAlgorithms(true, PREFERRED_COMPRESSION_ALGORITHMS);
 
+        // TODO: Now use keysExpiryDates here!!! (and some lines below)
+
         // TODO: this doesn't work quite right yet (APG 1)
         // if (keyEditor.getExpiryDate() != null) {
         // GregorianCalendar creationDate = new GregorianCalendar();