diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-08 00:17:21 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-08 00:17:21 +0100 |
| commit | 5dd5685885150ad5ba20e299e40b04762bdb05d4 (patch) | |
| tree | fd635ba9e9b27e5604c0f5f90db4e47cfe2eacc3 /src/main/java/eu/siacs/conversations/entities | |
| parent | c59eb75a59d2fbddea2a42e7d2435e7312f5c759 (diff) | |
| parent | 62d0eebe5cfa07bf17dff7f0476428ae649d53ff (diff) | |
Merge pull request #1641 from fiaxh/uuid-fix
Correct uuid check according to RFC 4122
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -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 4a49d1b3..c5831e7e 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()) |