diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-09-18 22:15:02 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-09-18 22:15:02 +0200 |
commit | badc97e2806755e9811f1c0bc3d803c0bddb7be7 (patch) | |
tree | bc24486520d4a982c5c7fa0e5475d0f88a53722d /src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java | |
parent | 7c608c88625a424e7881116e3e7373c80fd73e28 (diff) |
don't simply ignore null in message body but try to avoid it
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java index 53768714..63f846c5 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java +++ b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java @@ -115,7 +115,11 @@ public class PgpDecryptionService { case OpenPgpApi.RESULT_CODE_SUCCESS: try { os.flush(); - message.setBody(os.toString()); + final String body = os.toString(); + if (body == null) { + throw new IOException("body was null"); + } + message.setBody(body); message.setEncryption(Message.ENCRYPTION_DECRYPTED); final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager(); if (message.trusted() |