diff options
| author | Christian S <christian@pix-art.de> | 2016-02-27 10:57:11 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-27 10:57:11 +0100 |
| commit | ff337163b7ccd5b580d132e7ffbc8643ef095ee0 (patch) | |
| tree | daa287001337dd7a7206916c444fe200c73101a4 /src/main/java/eu/siacs/conversations/utils | |
| parent | 737b53a4866c3e06188d0f2271249b05bc179505 (diff) | |
| parent | c17b19c40c9b66c3892f1a9d7a6548b7f72b0330 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
| -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, |