diff options
| author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
| commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
| tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
| parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 4a49d1b3c..c5831e7ec 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -363,7 +363,7 @@ public class Message extends AbstractEntity { && this.counterpart.equals(message.getCounterpart()) && (body.equals(otherBody) ||(message.getEncryption() == Message.ENCRYPTION_PGP - && message.getRemoteMsgId().matches("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"))) ; + && message.getRemoteMsgId().matches("[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"))) ; } else { return this.remoteMsgId == null && this.counterpart.equals(message.getCounterpart()) |