diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 92917fa51..966c43597 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -41,7 +41,7 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; -import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult; +import org.sufficientlysecure.keychain.service.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.pgp.PgpHelper; import org.sufficientlysecure.keychain.pgp.PgpImportExport; import org.sufficientlysecure.keychain.pgp.PgpKeyOperation; @@ -343,12 +343,12 @@ public class KeychainIntentService extends IntentService implements Progressable new ProviderHelper(this), new PgpDecryptVerify.PassphraseCache() { @Override - public String getCachedPassphrase(long masterKeyId) throws PgpDecryptVerify.NoSecretKeyException { + public String getCachedPassphrase(long masterKeyId) { try { return PassphraseCacheService.getCachedPassphrase( KeychainIntentService.this, masterKeyId); } catch (PassphraseCacheService.KeyNotFoundException e) { - throw new PgpDecryptVerify.NoSecretKeyException(); + return null; } } }, @@ -358,7 +358,7 @@ public class KeychainIntentService extends IntentService implements Progressable .setAllowSymmetricDecryption(true) .setPassphrase(passphrase); - PgpDecryptVerifyResult decryptVerifyResult = builder.build().execute(); + DecryptVerifyResult decryptVerifyResult = builder.build().execute(); outStream.close(); @@ -407,7 +407,7 @@ public class KeychainIntentService extends IntentService implements Progressable .setPassphrase(passphrase) .setDecryptMetadataOnly(true); - PgpDecryptVerifyResult decryptVerifyResult = builder.build().execute(); + DecryptVerifyResult decryptVerifyResult = builder.build().execute(); resultData.putParcelable(RESULT_DECRYPT_VERIFY_RESULT, decryptVerifyResult); @@ -785,16 +785,6 @@ public class KeychainIntentService extends IntentService implements Progressable message = getString(R.string.error_no_signature_passphrase); } else if (e instanceof PgpSignEncrypt.NoSigningKeyException) { message = getString(R.string.error_no_signature_key); - } else if (e instanceof PgpDecryptVerify.InvalidDataException) { - message = getString(R.string.error_invalid_data); - } else if (e instanceof PgpDecryptVerify.KeyExtractionException) { - message = getString(R.string.error_could_not_extract_private_key); - } else if (e instanceof PgpDecryptVerify.WrongPassphraseException) { - message = getString(R.string.error_wrong_passphrase); - } else if (e instanceof PgpDecryptVerify.NoSecretKeyException) { - message = getString(R.string.error_no_secret_key_found); - } else if (e instanceof PgpDecryptVerify.IntegrityCheckFailedException) { - message = getString(R.string.error_integrity_check_failed); } else { message = e.getMessage(); } |