key edit: fix crash when create date was after expiry date, change from gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity

1 files changed, 3 insertions, 2 deletions

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 626feeb75..71bdb0231 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -24,6 +24,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.sufficientlysecure.keychain.pgp.PgpConversionHelper;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 public class SaveKeyringParcel implements Parcelable {
@@ -35,7 +36,7 @@ public class SaveKeyringParcel implements Parcelable {
     public boolean primaryIDChanged;
     public boolean[] moddedKeys;
     public ArrayList<PGPSecretKey> deletedKeys;
-    public ArrayList<GregorianCalendar> keysExpiryDates;
+    public ArrayList<Calendar> keysExpiryDates;
     public ArrayList<Integer> keysUsages;
     public String newPassphrase;
     public String oldPassphrase;
@@ -58,7 +59,7 @@ public class SaveKeyringParcel implements Parcelable {
         } else {
             deletedKeys = PgpConversionHelper.BytesToPGPSecretKeyList(tmp);
         }
-        keysExpiryDates = (ArrayList<GregorianCalendar>) source.readSerializable();
+        keysExpiryDates = (ArrayList<Calendar>) source.readSerializable();
         keysUsages = source.readArrayList(Integer.class.getClassLoader());
         newPassphrase = source.readString();
         oldPassphrase = source.readString();