moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

fix nullpointer

This commit is contained in:
Dominik Schürmann 2014-02-14 02:41:27 +01:00
parent 7939aaaa44
commit ee2fec1759
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenPGP-Keychain-API/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
View File

@ -56,8 +56,11 @@ public class OpenPgpApi {
}
});
Bundle params = new Bundle();
params.putInt(OpenPgpConstants.PARAMS_API_VERSION, OpenPgpConstants.API_VERSION);
// blocks until result is ready
Bundle result = mService.sign(null, input, output);
Bundle result = mService.sign(params, input, output);
// close() is required to halt the TransferThread
output.close();

10
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java
View File

@ -522,9 +522,17 @@ public class OpenPgpService extends RemoteService {
public Bundle sign(Bundle params, final ParcelFileDescriptor input, final ParcelFileDescriptor output) {
final AppSettings appSettings = getAppSettings();
Bundle result = new Bundle();
if (params == null) {
Bundle result = new Bundle();
OpenPgpError error = new OpenPgpError(OpenPgpError.GENERIC_ERROR, "params Bundle required!");
result.putParcelable(OpenPgpConstants.RESULT_ERRORS, error);
result.putInt(OpenPgpConstants.RESULT_CODE, OpenPgpConstants.RESULT_CODE_ERROR);
return result;
}
if (params.getInt(OpenPgpConstants.PARAMS_API_VERSION) != OpenPgpConstants.API_VERSION) {
// not compatible!
Bundle result = new Bundle();
OpenPgpError error = new OpenPgpError(OpenPgpError.INCOMPATIBLE_API_VERSIONS, "Incompatible API versions!");
result.putParcelable(OpenPgpConstants.RESULT_ERRORS, error);
result.putInt(OpenPgpConstants.RESULT_CODE, OpenPgpConstants.RESULT_CODE_ERROR);

5
libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
View File

@ -56,8 +56,11 @@ public class OpenPgpApi {
}
});
Bundle params = new Bundle();
params.putInt(OpenPgpConstants.PARAMS_API_VERSION, OpenPgpConstants.API_VERSION);
// blocks until result is ready
Bundle result = mService.sign(null, input, output);
Bundle result = mService.sign(params, input, output);
// close() is required to halt the TransferThread
output.close();