cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix API backward compat

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-10 14:18:15 +02:00
parent acbb3edf9b
commit ec76d56b82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@@ -583,13 +583,13 @@ public class OpenPgpService extends RemoteService {
} }
} }
if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) < 6) { if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) < 8) {
// RESULT_INVALID_INSECURE has been added in version 6, fallback to RESULT_INVALID_SIGNATURE // RESULT_INVALID_INSECURE has been added in version 8, fallback to RESULT_INVALID_SIGNATURE
if (signatureResult.getResult() == OpenPgpSignatureResult.RESULT_INVALID_INSECURE) { if (signatureResult.getResult() == OpenPgpSignatureResult.RESULT_INVALID_INSECURE) {
signatureResult.setResult(OpenPgpSignatureResult.RESULT_INVALID_SIGNATURE); signatureResult.setResult(OpenPgpSignatureResult.RESULT_INVALID_SIGNATURE);
} }
// RESULT_NO_SIGNATURE has been added in version 6, before the signatureResult was null // RESULT_NO_SIGNATURE has been added in version 8, before the signatureResult was null
if (signatureResult.getResult() == OpenPgpSignatureResult.RESULT_NO_SIGNATURE) { if (signatureResult.getResult() == OpenPgpSignatureResult.RESULT_NO_SIGNATURE) {
result.putExtra(OpenPgpApi.RESULT_SIGNATURE, (Parcelable[]) null); result.putExtra(OpenPgpApi.RESULT_SIGNATURE, (Parcelable[]) null);
} }
@@ -602,7 +602,7 @@ public class OpenPgpService extends RemoteService {
} }
} }
if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) >= 6) { if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) >= 8) {
OpenPgpDecryptionResult decryptionResult = pgpResult.getDecryptionResult(); OpenPgpDecryptionResult decryptionResult = pgpResult.getDecryptionResult();
if (decryptionResult != null) { if (decryptionResult != null) {
result.putExtra(OpenPgpApi.RESULT_DECRYPTION, decryptionResult); result.putExtra(OpenPgpApi.RESULT_DECRYPTION, decryptionResult);