Revert "Replace PgpGeneralException with NotFoundException where appropriate"

This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.

1 files changed, 5 insertions, 8 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 00696d150..40e265253 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -385,22 +385,19 @@ public class PgpSignEncrypt {
 
                 // Asymmetric encryption
                 for (long id : mEncryptionMasterKeyIds) {
-                    CanonicalizedPublicKeyRing keyRing = null;
                     try {
-                        keyRing = mProviderHelper.getCanonicalizedPublicKeyRing(
+                        CanonicalizedPublicKeyRing keyRing = mProviderHelper.getCanonicalizedPublicKeyRing(
                                 KeyRings.buildUnifiedKeyRingUri(id));
-                    } catch (ProviderHelper.NotFoundException e) {
-                        log.add(LogType.MSG_SE_KEY_UNKNOWN, indent + 1,
-                                KeyFormattingUtils.convertKeyIdToHex(id));
-                    }
-                    try {
                         CanonicalizedPublicKey key = keyRing.getEncryptionSubKey();
                         cPk.addMethod(key.getPubKeyEncryptionGenerator());
                         log.add(LogType.MSG_SE_KEY_OK, indent + 1,
                                 KeyFormattingUtils.convertKeyIdToHex(id));
-                    } catch (ProviderHelper.NotFoundException e) {
+                    } catch (PgpGeneralException e) {
                         log.add(LogType.MSG_SE_KEY_WARN, indent + 1,
                                 KeyFormattingUtils.convertKeyIdToHex(id));
+                    } catch (ProviderHelper.NotFoundException e) {
+                        log.add(LogType.MSG_SE_KEY_UNKNOWN, indent + 1,
+                                KeyFormattingUtils.convertKeyIdToHex(id));
                     }
                 }
             }