Remove some Ids...

3 files changed, 4 insertions, 59 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index 26c4ebd91..853f99a04 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -53,7 +53,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.util.InputData;
@@ -194,15 +193,9 @@ public class PgpDecryptVerify {
 
     /**
      * Decrypts and/or verifies data based on parameters of class
-     *
-     * @return
-     * @throws IOException
-     * @throws PgpGeneralException
-     * @throws PGPException
-     * @throws SignatureException
      */
     public PgpDecryptVerifyResult execute()
-            throws IOException, PgpGeneralException, PGPException, SignatureException,
+            throws IOException, PGPException, SignatureException,
             WrongPassphraseException, NoSecretKeyException, KeyExtractionException,
             InvalidDataException, IntegrityCheckFailedException {
         // automatically works with ascii armor input and binary
@@ -224,16 +217,9 @@ public class PgpDecryptVerify {
 
     /**
      * Decrypt and/or verifies binary or ascii armored pgp
-     *
-     * @param in
-     * @return
-     * @throws IOException
-     * @throws PgpGeneralException
-     * @throws PGPException
-     * @throws SignatureException
      */
     private PgpDecryptVerifyResult decryptVerify(InputStream in)
-            throws IOException, PgpGeneralException, PGPException, SignatureException,
+            throws IOException, PGPException, SignatureException,
             WrongPassphraseException, KeyExtractionException, NoSecretKeyException,
             InvalidDataException, IntegrityCheckFailedException {
         PgpDecryptVerifyResult result = new PgpDecryptVerifyResult();
@@ -574,15 +560,9 @@ public class PgpDecryptVerify {
      * <p/>
      * The method is heavily based on
      * pg/src/main/java/org/spongycastle/openpgp/examples/ClearSignedFileProcessor.java
-     *
-     * @return
-     * @throws IOException
-     * @throws PgpGeneralException
-     * @throws PGPException
-     * @throws SignatureException
      */
     private PgpDecryptVerifyResult verifyCleartextSignature(ArmoredInputStream aIn)
-            throws IOException, PgpGeneralException, PGPException, SignatureException, InvalidDataException {
+            throws IOException, PGPException, SignatureException, InvalidDataException {
         PgpDecryptVerifyResult result = new PgpDecryptVerifyResult();
         OpenPgpSignatureResult signatureResult = new OpenPgpSignatureResult();
         // cleartext signatures are never encrypted ;)
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 e370f5cf6..418433427 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -43,7 +43,6 @@ import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodG
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
@@ -248,16 +247,9 @@ public class PgpSignEncrypt {
 
     /**
      * Signs and/or encrypts data based on parameters of class
-     *
-     * @throws IOException
-     * @throws PgpGeneralException
-     * @throws PGPException
-     * @throws NoSuchProviderException
-     * @throws NoSuchAlgorithmException
-     * @throws SignatureException
      */
     public void execute()
-            throws IOException, PgpGeneralException, PGPException, NoSuchProviderException,
+            throws IOException, PGPException, NoSuchProviderException,
             NoSuchAlgorithmException, SignatureException, KeyExtractionException, NoSigningKeyException, NoPassphraseException {
 
         boolean enableSignature = mSignatureMasterKeyId != Id.key.none;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
deleted file mode 100644
index 1a50b03b8..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.pgp.exception;
-
-public class NoAsymmetricEncryptionException extends Exception {
-    static final long serialVersionUID = 0xf812773343L;
-
-    public NoAsymmetricEncryptionException() {
-        super();
-    }
-}