From 3165f3ffa8b16dcee11e6dfc21492b556d0c1de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 8 Oct 2014 18:33:01 +0200 Subject: Remove unnecessary exception --- .../sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java | 4 ++-- .../keychain/pgp/OpenPgpSignatureResultBuilder.java | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java index b1e7eaeb5..08b7316aa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java @@ -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 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java index c7241c723..bd7606194 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java @@ -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); - } + setKeyExpired(signingRing.isExpired() || signingKey.isExpired()); + setKeyRevoked(signingRing.isRevoked() || signingKey.isRevoked()); } public OpenPgpSignatureResult build() { -- cgit v1.2.3