diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 01:11:08 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-14 01:11:08 +0200 |
commit | 13ffd2038d56d90ffc583663a98c378ee9d9aa00 (patch) | |
tree | 0009143b39833be11bc428c340ffc602f2e3069b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 55bad4cac747cedfdda978a94d41f8069358373f (diff) | |
download | open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.tar.gz open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.tar.bz2 open-keychain-13ffd2038d56d90ffc583663a98c378ee9d9aa00.zip |
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
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java | 5 |
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(); |