diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-24 09:23:30 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-24 09:23:30 +0100 |
commit | ddafa65849e6c7e8d17566208b57ec614de05d5f (patch) | |
tree | 0c991e5c3cb803fb2a165989c6b117e037f49222 /src/main/java/eu/siacs/conversations/utils/UIHelper.java | |
parent | 17b1fcc3eafa078a902c662a6e774bcd7f2927b3 (diff) | |
parent | 894b5892a977c6b7ac52f07e00f452a44bdc1168 (diff) |
Merge pull request #1715 from fiaxh/gpg_decryption_failed
PGP Retry decryption from message menu
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/UIHelper.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index cf1e0d3b9..5e8af085c 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -171,7 +171,9 @@ public class UIHelper { return new Pair<>("",false); } } else if (message.getEncryption() == Message.ENCRYPTION_PGP) { - return new Pair<>(context.getString(R.string.encrypted_message_received),true); + return new Pair<>(context.getString(R.string.pgp_message),true); + } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { + return new Pair<>(context.getString(R.string.decryption_failed), true); } else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) { if (message.getStatus() == Message.STATUS_RECEIVED) { return new Pair<>(context.getString(R.string.received_x_file, |