aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Message.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-24 09:23:30 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-24 09:23:30 +0100
commitddafa65849e6c7e8d17566208b57ec614de05d5f (patch)
tree0c991e5c3cb803fb2a165989c6b117e037f49222 /src/main/java/eu/siacs/conversations/entities/Message.java
parent17b1fcc3eafa078a902c662a6e774bcd7f2927b3 (diff)
parent894b5892a977c6b7ac52f07e00f452a44bdc1168 (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/entities/Message.java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 63db9a44..3dfbd787 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -449,6 +449,7 @@ public class Message extends AbstractEntity {
this.getTransferable() == null &&
message.getTransferable() == null &&
message.getEncryption() != Message.ENCRYPTION_PGP &&
+ message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED &&
this.getType() == message.getType() &&
//this.getStatus() == message.getStatus() &&
isStatusMergeable(this.getStatus(), message.getStatus()) &&