diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-11 17:22:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-11 17:22:53 +0200 |
| commit | 59096b37fdfef1d9294990a64c755080585b1da6 (patch) | |
| tree | 64ec6dcf350b084bfb980fd4526a951c983ae319 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
| parent | 82e66cd5b8557fd5898e797b10396e33f82a8aa6 (diff) | |
| download | open-keychain-59096b37fdfef1d9294990a64c755080585b1da6.tar.gz open-keychain-59096b37fdfef1d9294990a64c755080585b1da6.tar.bz2 open-keychain-59096b37fdfef1d9294990a64c755080585b1da6.zip | |
Support API versions 3 and 4
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 5ed95acb3..d3a38c5d7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -507,7 +507,10 @@ public class OpenPgpService extends RemoteService { } // version code is required and needs to correspond to version code of service! - if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) != OpenPgpApi.API_VERSION) { + // History of versions in org.openintents.openpgp.util.OpenPgpApi + // we support 3 and 4 + if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) != 3 + || data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) != 4) { Intent result = new Intent(); OpenPgpError error = new OpenPgpError (OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!"); |