cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Add creation date and more check on keys's data

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-04 17:03:03 +02:00
parent 8c6c97d932
commit ebe7b6293d
25 changed files with 113 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java
View File

@@ -83,13 +83,21 @@ public abstract class CanonicalizedKeyRing extends KeyRing {
return getRing().getPublicKey().isRevoked();
}
public Date getCreationDate() {
return getPublicKey().getCreationTime();
}
public Date getExpirationDate() {
return getPublicKey().getExpiryTime();
}
public boolean isExpired() {
// Is the master key expired?
Date creationDate = getPublicKey().getCreationTime();
Date expiryDate = getPublicKey().getExpiryTime();
Date creationDate = getCreationDate();
Date expirationDate = getExpirationDate();
Date now = new Date();
return creationDate.after(now) || (expiryDate != null && expiryDate.before(now));
return creationDate.after(now) || (expirationDate != null && expirationDate.before(now));
}
public boolean canCertify() throws PgpKeyNotFoundException {