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/entities/Message.java | |
| parent | 737b53a4866c3e06188d0f2271249b05bc179505 (diff) | |
| parent | c17b19c40c9b66c3892f1a9d7a6548b7f72b0330 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 1 |
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 63db9a447..3dfbd787c 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()) && |