mime: respect charset header (default to utf-8)

1 files changed, 2 insertions, 3 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 57dd068ef..e7709e58e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -628,15 +628,14 @@ public class OpenPgpService extends RemoteService {
                     }
                 }
 
-
+                OpenPgpMetadata metadata = pgpResult.getDecryptionMetadata();
                 if (data.getIntExtra(OpenPgpApi.EXTRA_API_VERSION, -1) >= 4) {
-                    OpenPgpMetadata metadata = pgpResult.getDecryptionMetadata();
                     if (metadata != null) {
                         result.putExtra(OpenPgpApi.RESULT_METADATA, metadata);
                     }
                 }
 
-                String charset = pgpResult.getCharset();
+                String charset = metadata != null ? metadata.getCharset() : null;
                 if (charset != null) {
                     result.putExtra(OpenPgpApi.RESULT_CHARSET, charset);
                 }