From 8dd63138266670295bbf081a97afa698a6a92a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 10 Dec 2015 15:24:23 +0100 Subject: Nicer RESULT_INSECURE fallback for old API versions --- .../sufficientlysecure/keychain/remote/OpenPgpService.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 5f48e44bd..78c02681b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -573,18 +573,11 @@ public class OpenPgpService extends Service { // case RESULT_NOT_ENCRYPTED, but a signature, fallback to deprecated signatureOnly variable if (decryptionResult.getResult() == OpenPgpDecryptionResult.RESULT_NOT_ENCRYPTED && signatureResult.getResult() != OpenPgpSignatureResult.RESULT_NO_SIGNATURE) { - // noinspection deprecation, TODO + // noinspection deprecation signatureResult.setSignatureOnly(true); } - // case RESULT_INSECURE, fallback to an error - if (decryptionResult.getResult() == OpenPgpDecryptionResult.RESULT_INSECURE) { - Intent resultError = new Intent(); - resultError.putExtra(OpenPgpApi.RESULT_ERROR, new OpenPgpError(OpenPgpError.GENERIC_ERROR, - "Insecure encryption: An outdated algorithm has been used!")); - resultError.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR); - return resultError; - } + // case RESULT_INSECURE, simply accept as a fallback like in previous API versions // case RESULT_ENCRYPTED // nothing to do! -- cgit v1.2.3