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

2015-01-27 09:43:45 +01:00
parent e049895b9f 6c80025ead
commit e77f9a5351
12 changed files with 188 additions and 57 deletions
--- 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()));