diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-27 09:17:23 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-27 09:17:23 +0100 |
commit | 6c80025ead59b558ebb2d6a9f802ef046e673388 (patch) | |
tree | 2eca36cb67aa39c35707e3c8084b23a507b7b1e7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | efe5c80b1cd4cecb313f399fb5d3b994e690a708 (diff) | |
download | open-keychain-6c80025ead59b558ebb2d6a9f802ef046e673388.tar.gz open-keychain-6c80025ead59b558ebb2d6a9f802ef046e673388.tar.bz2 open-keychain-6c80025ead59b558ebb2d6a9f802ef046e673388.zip |
backend support for charset in ascii-armored streams
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())); |