aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-07-11 15:20:16 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-07-11 15:20:16 +0200
commit7b195ac2e37cd8223dd788e8978f3bfd3d9596cb (patch)
tree63e1677937087cafb0b43536ff3b71d467b93eb4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
parente7efd2c539a58c5a7a14bffebc287ee0b91b51d3 (diff)
downloadopen-keychain-7b195ac2e37cd8223dd788e8978f3bfd3d9596cb.tar.gz
open-keychain-7b195ac2e37cd8223dd788e8978f3bfd3d9596cb.tar.bz2
open-keychain-7b195ac2e37cd8223dd788e8978f3bfd3d9596cb.zip
modifyKey: make SubkeyChange operations work
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java1
1 files changed, 1 insertions, 0 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 a0dbf2b0b..5e90b396e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -76,6 +76,7 @@ public class SaveKeyringParcel implements Parcelable {
public static class SubkeyChange implements Serializable {
public long mKeyId;
public Integer mFlags;
+ // this is a long unix timestamp, in seconds (NOT MILLISECONDS!)
public Long mExpiry;
public SubkeyChange(long keyId, Integer flags, Long expiry) {
mKeyId = keyId;