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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2016-07-07 13:10:28 +02:00
parent 72da8e98a6 02a5611ec9
commit 3b544065f7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,11 +467,8 @@ public class OpenPgpService extends Service {
cryptoInput.mPassphrase = cryptoInput.mPassphrase =
new Passphrase(data.getCharArrayExtra(OpenPgpApi.EXTRA_PASSPHRASE)); new Passphrase(data.getCharArrayExtra(OpenPgpApi.EXTRA_PASSPHRASE));
} }
if (data.hasExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT_WRAPPER)) { if (data.hasExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT)) {
// this is wrapped in a Bundle to avoid ClassLoader problems OpenPgpDecryptionResult decryptionResult = data.getParcelableExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT);
Bundle wrapperBundle = data.getBundleExtra(OpenPgpApi.EXTRA_DECRYPTION_RESULT_WRAPPER);
wrapperBundle.setClassLoader(getClassLoader());
OpenPgpDecryptionResult decryptionResult = wrapperBundle.getParcelable(OpenPgpApi.EXTRA_DECRYPTION_RESULT);
if (decryptionResult != null && decryptionResult.hasDecryptedSessionKey()) { if (decryptionResult != null && decryptionResult.hasDecryptedSessionKey()) {
cryptoInput.addCryptoData(decryptionResult.getSessionKey(), decryptionResult.getDecryptedSessionKey()); cryptoInput.addCryptoData(decryptionResult.getSessionKey(), decryptionResult.getDecryptedSessionKey());
} }
@@ -916,6 +913,9 @@ public class OpenPgpService extends Service {
@Nullable InputStream inputStream, @Nullable InputStream inputStream,
@Nullable OutputStream outputStream) { @Nullable OutputStream outputStream) {
// We need to be able to load our own parcelables
data.setExtrasClassLoader(getClassLoader());
Intent errorResult = checkRequirements(data); Intent errorResult = checkRequirements(data);
if (errorResult != null) { if (errorResult != null) {
return errorResult; return errorResult;

2
extern/openpgp-api-lib vendored

Submodule extern/openpgp-api-lib updated: ff848daa51...16409bfab3