mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 00:18:51 -05:00
Remove unnecessary exception
This commit is contained in:
parent
0d6d4653b4
commit
3165f3ffa8
@ -72,12 +72,12 @@ public abstract class CanonicalizedKeyRing extends KeyRing {
|
||||
return getPublicKey().getUnorderedUserIds();
|
||||
}
|
||||
|
||||
public boolean isRevoked() throws PgpGeneralException {
|
||||
public boolean isRevoked() {
|
||||
// Is the master key revoked?
|
||||
return getRing().getPublicKey().isRevoked();
|
||||
}
|
||||
|
||||
public boolean isExpired() throws PgpGeneralException {
|
||||
public boolean isExpired() {
|
||||
// Is the master key expired?
|
||||
Date creationDate = getRing().getPublicKey().getCreationTime();
|
||||
Date expiryDate = getRing().getPublicKey().getValidSeconds() > 0
|
||||
|
@ -104,13 +104,8 @@ public class OpenPgpSignatureResultBuilder {
|
||||
setUserIds(signingRing.getUnorderedUserIds());
|
||||
|
||||
// either master key is expired/revoked or this specific subkey is expired/revoked
|
||||
try {
|
||||
setKeyExpired(signingRing.isExpired() || signingKey.isExpired());
|
||||
setKeyRevoked(signingRing.isRevoked() || signingKey.isRevoked());
|
||||
} catch (PgpGeneralException e) {
|
||||
Log.e(Constants.TAG, "shouldn't happen!");
|
||||
setKeyRevoked(true);
|
||||
}
|
||||
}
|
||||
|
||||
public OpenPgpSignatureResult build() {
|
||||
|
Loading…
Reference in New Issue
Block a user