diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:43:45 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 09:43:45 +0100 |
commit | e77f9a535119f25b0f3ad31ef8065db18ceddff7 (patch) | |
tree | e90e4c5d77c57c500bcfb9ad6183fb64cdf00644 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
parent | 6c80025ead59b558ebb2d6a9f802ef046e673388 (diff) | |
download | open-keychain-e77f9a535119f25b0f3ad31ef8065db18ceddff7.tar.gz open-keychain-e77f9a535119f25b0f3ad31ef8065db18ceddff7.tar.bz2 open-keychain-e77f9a535119f25b0f3ad31ef8065db18ceddff7.zip |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
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 | 6 |
1 files changed, 6 insertions, 0 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 9534cc49d..68677fb9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -557,6 +557,12 @@ public class OpenPgpService extends RemoteService { result.putExtra(OpenPgpApi.RESULT_METADATA, metadata); } } + + String charset = pgpResult.getCharset(); + if (charset != null) { + result.putExtra(OpenPgpApi.RESULT_CHARSET, charset); + } + } else { LogEntryParcel errorMsg = pgpResult.getLog().getLast(); throw new Exception(getString(errorMsg.mType.getMsgId())); |