moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Fix API version support, update api lib

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-12 13:54:46 +02:00
parent ae5e75f4e1
commit a4a6314041
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,10 +523,12 @@ public class OpenPgpService extends RemoteService {
// 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) {
&& data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) != 4) {
Intent result = new Intent();
OpenPgpError error = new OpenPgpError
(OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!");
(OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!\n"
+ "used API version: " + data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) + "\n"
+ "supported API versions: 3, 4");
result.putExtra(OpenPgpApi.RESULT_ERROR, error);
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
return result;

2
extern/openpgp-api-lib vendored

@ -1 +1 @@
Subproject commit 940a1d8eebe297e6a94f417a24c0403f1d8d650f
Subproject commit cbfeb90cec9d9ecea2576eddf42e37154286c667